@@ -31,7 +31,7 @@
 #include "boost/unordered_map.hpp"
 
 // Source.Python
-#include "modules/memory/memory_function.h"
+#include "modules/memory/memory_pointer.h"
 #include "entities_props.h"
 #include ENGINE_INCLUDE_PATH(entities_props.h)
 
@@ -136,15 +136,15 @@ int SendTableSharedExt::find_offset(SendTable* pTable, const char* name)
 // ============================================================================
 // >> SendPropSharedExt
 // ============================================================================
-CFunction* SendPropSharedExt::get_proxy_function(SendProp *pSendProp, object oCallingConvention, object args, object oReturnType)
+BoostSendVarProxyFn SendPropSharedExt::get_proxy_function(SendProp *pSendProp)
 {
 	if (pSendProp->IsExcludeProp())
 		BOOST_RAISE_EXCEPTION(PyExc_TypeError, "%s is excluded.", pSendProp->GetName());
 
 	if (pSendProp->GetType() == DPT_DataTable)
 		BOOST_RAISE_EXCEPTION(PyExc_TypeError, "%s is a DataTable.", pSendProp->GetName());
 
-	return new CFunction((unsigned long)pSendProp->GetProxyFn(), oCallingConvention, args, oReturnType);
+	return BoostSendVarProxyFn(pSendProp->GetProxyFn());
 }
 
 
 
@@ -37,10 +37,15 @@
 #include "isaverestore.h"
 
 
+//-----------------------------------------------------------------------------
+// typedefs
+//-----------------------------------------------------------------------------
+BOOST_FUNCTION_TYPEDEF(void (const SendProp*, const void*, const void*, DVariant*, int, int), BoostSendVarProxyFn)
+
+
 //-----------------------------------------------------------------------------
 // Forward declarations
 //-----------------------------------------------------------------------------
-class CFunction;
 class CPointer;
 
 
@@ -61,7 +66,7 @@ class SendTableSharedExt
 class SendPropSharedExt
 {
 public:
-	static CFunction *get_proxy_function(SendProp *pSendProp, object oCallingConvention, object args, object oReturnType);
+	static BoostSendVarProxyFn get_proxy_function(SendProp *pSendProp);
 };
 
 
 
@@ -116,6 +116,8 @@ void export_send_table(scope _props)
 //-----------------------------------------------------------------------------
 void export_send_prop(scope _props)
 {
+	EXPOSE_FUNCTION_TYPEDEF(BoostSendVarProxyFn, "SendVarProxyFn")
+
 	class_<SendProp, SendProp *, boost::noncopyable> SendProp_("SendProp", no_init);
 
 	// Properties...
@@ -140,6 +142,7 @@ void export_send_prop(scope _props)
 	);
 
 	SendProp_.add_property("offset", &SendProp::GetOffset);
+	SendProp_.add_property("proxy_function", &SendPropSharedExt::get_proxy_function);
 
 	// CS:GO specific properties...
 	SendProp_.NOT_IMPLEMENTED_ATTR("priority");
@@ -150,8 +153,6 @@ void export_send_prop(scope _props)
 	SendProp_.def("is_exclude_prop", &SendProp::IsExcludeProp);
 	SendProp_.def("is_inside_array", &SendProp::IsInsideArray);
 
-	SendProp_.def("get_proxy_function", &SendPropSharedExt::get_proxy_function, manage_new_object_policy());
-
 	// CS:GO specific methods...
 	SendProp_.NOT_IMPLEMENTED("get_priority");
 
 
@@ -29,6 +29,7 @@
 //---------------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------------
+#include "boost/function.hpp"
 #include "boost/python.hpp"
 using namespace boost::python;
 
@@ -42,6 +43,23 @@ using namespace boost::python;
 #error("SOURCE_ENGINE_BRANCH define must be globally defined, did we forget?");
 #endif
 
+//---------------------------------------------------------------------------------
+// Macros to expose function typedefs
+//---------------------------------------------------------------------------------
+// Example typedef:
+// typedef int (*MultiplyFn)(int, int);
+// 
+// Example usage:
+// BOOST_FUNCTION_TYPEDEF(int (int, int), BoostMultiplyFn)
+#define BOOST_FUNCTION_TYPEDEF(sig, cpp_name) \
+	typedef boost::function< sig> cpp_name;
+
+// Example usage:
+// EXPOSE_FUNCTION_TYPEDEF(BoostMultiplyFn, "MultiplyFn")
+#define EXPOSE_FUNCTION_TYPEDEF(cpp_name, py_name) \
+	class_<cpp_name>(py_name, no_init) \
+		.def("__call__", &cpp_name::operator()) \
+	;
 
 //---------------------------------------------------------------------------------
 // Surround boost python statements with this macro in order to handle exceptions.