diff --git a/SCsub b/SCsub
index f514975..55ed8a0 100644
--- a/SCsub
+++ b/SCsub
@@ -2,6 +2,9 @@ Import('env')
 
 if ARGUMENTS.get('entity_mem_tools', 'no') == 'yes':
     env.Append(CPPDEFINES=['ENTITY_MEM_TOOLS'])
+    
+if ARGUMENTS.get('entities_2d', 'no') == 'yes':
+    env.Append(CPPDEFINES=['ENTITIES_2D'])
 
 module_env = env.Clone()
 
diff --git a/config.pyc b/config.pyc
index fab5937..bb0cdb7 100644
Binary files a/config.pyc and b/config.pyc differ
diff --git a/entities/entity.h b/entities/entity.h
index 292fb22..b805169 100644
--- a/entities/entity.h
+++ b/entities/entity.h
@@ -29,6 +29,8 @@ class SpellDamageInfo;
 class SpellCastInfo;
 
 class EntityCreateInfo : public Object {
+    GDCLASS(EntityCreateInfo, Object);
+    
 public:
 	int get_guid() { return _guid; }
 	void set_guid(int value) { _guid = value; }
@@ -123,9 +125,17 @@ enum PlayerSendFlags {
 	SEND_FLAG_AURAS,
 };
 
+#ifdef ENTITIES_2D
 class Entity : public KinematicBody {
-	GDCLASS(Entity, KinematicBody)
-
+	GDCLASS(Entity, KinematicBody);
+    
+#else
+    
+class Entity : public KinematicBody {
+	GDCLASS(Entity, KinematicBody);
+    
+#endif
+    
 public:
 	Entity();
 	~Entity();