diff --git a/SDK/include/NDK/BaseComponent.hpp b/SDK/include/NDK/BaseComponent.hpp
index 4e9b53328..317261ea7 100644
--- a/SDK/include/NDK/BaseComponent.hpp
+++ b/SDK/include/NDK/BaseComponent.hpp
@@ -7,15 +7,13 @@
 #ifndef NDK_BASECOMPONENT_HPP
 #define NDK_BASECOMPONENT_HPP
 
-#include <NDK/Prerequesites.hpp>
+#include <NDK/EntityHandle.hpp>
 #include <functional>
 #include <unordered_map>
 #include <vector>
 
 namespace Ndk
 {
-	class Entity;
-
 	class NDK_API BaseComponent
 	{
 		friend Entity;
@@ -38,7 +36,7 @@ namespace Ndk
 
 		protected:
 			ComponentIndex m_componentIndex;
-			Entity* m_entity;
+			EntityHandle m_entity;
 
 			static ComponentIndex RegisterComponent(ComponentId id, Factory factoryFunc);
 
diff --git a/SDK/include/NDK/World.inl b/SDK/include/NDK/World.inl
index f71d6962b..0b0b30b63 100644
--- a/SDK/include/NDK/World.inl
+++ b/SDK/include/NDK/World.inl
@@ -11,8 +11,6 @@ namespace Ndk
 	{
 		if (addDefaultSystems)
 			AddDefaultSystems();
-
-		m_entities.reserve(100); // Temporaire, je le jure
 	}
 
 	inline BaseSystem& World::AddSystem(std::unique_ptr<BaseSystem>&& system)