@@ -63,11 +63,6 @@ def __new__(cls, index):
         # Initialize the object
         super(Entity, self).__init__(index)
 
-        # Set the entity's base attributes
-        self._index = index
-        self._edict = edict
-        self._pointer = pointer_from_edict(edict)
-
         # Return the instance
         return self
 
@@ -179,37 +174,12 @@ def _obj(cls, ptr):
         """Return an entity instance of the given pointer."""
         return cls(index_from_pointer(ptr))
 
-    @property
-    def index(self):
-        """Return the entity's index."""
-        return self._index
-
-    @property
-    def edict(self):
-        """Return the entity's edict instance."""
-        return self._edict
-
-    @property
-    def pointer(self):
-        """Return the entity's pointer."""
-        return self._pointer
-
     @property
     def instances(self):
         """Yield the entity's base instances."""
         yield self.edict
         yield self.pointer
 
-    @property
-    def basehandle(self):
-        """Return the entity's BaseEntityHandle instance."""
-        return self.edict.networkable.get_entity_handle().get_ref_ehandle()
-
-    @property
-    def inthandle(self):
-        """Return the entity's integer handle."""
-        return self.basehandle.to_int()
-
     @property
     def classname(self):
         """Return the classname of the entity."""
 
@@ -31,7 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "utilities/wrap_macros.h"
-#include "entities_constants_wrap.h"
+#include "entities_constants.h"
 
 
 //-----------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 // #include "game/shared/predictioncopy.h"
-#include "entities_datamaps_wrap.h"
+#include "entities_datamaps.h"
 
 
 //-----------------------------------------------------------------------------
 
@@ -32,7 +32,7 @@
 //-----------------------------------------------------------------------------
 #include "dt_common.h"
 #include "dt_send.h"
-#include "entities_props_wrap.h"
+#include "entities_props.h"
 
 
 //-----------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "entities_wrap.h"
+#include "entities.h"
 
 
 //-----------------------------------------------------------------------------
 
@@ -81,6 +81,12 @@ void export_base_entity(scope _entity)
 		"The DataMap instance of this entity (read-only)."
 	);
 
+	BaseEntity.add_property("edict", make_function(&EdictFromBaseEntity, reference_existing_object_policy()));
+	BaseEntity.add_property("index", &IndexFromBaseEntity);
+	BaseEntity.add_property("pointer", make_function(&PointerFromBaseEntity, manage_new_object_policy()));
+	BaseEntity.add_property("basehandle", &BaseHandleFromBaseEntity);
+	BaseEntity.add_property("inthandle", &IntHandleFromBaseEntity);
+
 	// Methods...
 	BaseEntity.def("get_key_value_string",
 		&CBaseEntityWrapper::GetKeyValueString,
 
@@ -36,7 +36,7 @@
 #include "eiface.h"
 #include "utilities/shared_utils.h"
 #include "export_main.h"
-#include "modules/entities/entities_entity_wrap.h"
+#include "modules/entities/entities_entity.h"
 #include "icommandline.h"
 
 BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(CBaseEntity)