diff --git a/Engine.Core/Abstract/IEntity.cs b/Engine.Core/Abstract/IEntity.cs
index feecf7a..d54ff83 100644
--- a/Engine.Core/Abstract/IEntity.cs
+++ b/Engine.Core/Abstract/IEntity.cs
@@ -1,5 +1,5 @@
 namespace Syntriax.Engine.Core.Abstract;
 
-public interface IEntity : IAssignableStateEnable
+public interface IEntity : IInitialize, IAssignableStateEnable
 {
 }
diff --git a/Engine.Core/Abstract/IInitialize.cs b/Engine.Core/Abstract/IInitialize.cs
index 3b54b09..91c1362 100644
--- a/Engine.Core/Abstract/IInitialize.cs
+++ b/Engine.Core/Abstract/IInitialize.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Syntriax.Engine.Core.Abstract;
 
-public interface IInitialize : IEntity
+public interface IInitialize
 {
     Action<IInitialize>? OnInitialized { get; set; }
     Action<IInitialize>? OnFinalized { get; set; }
diff --git a/Engine.Core/GameManager.cs b/Engine.Core/GameManager.cs
index 64450cd..d987cc1 100644
--- a/Engine.Core/GameManager.cs
+++ b/Engine.Core/GameManager.cs
@@ -10,7 +10,7 @@ using Syntriax.Engine.Core.Factory;
 
 namespace Syntriax.Engine.Core;
 
-public class GameManager : IInitialize
+public class GameManager : IEntity
 {
     public Action<IInitialize>? OnInitialized { get; set; } = null;
     public Action<IInitialize>? OnFinalized { get; set; } = null;
diff --git a/Engine.Core/StateEnable.cs b/Engine.Core/StateEnable.cs
index 9815430..cf38305 100644
--- a/Engine.Core/StateEnable.cs
+++ b/Engine.Core/StateEnable.cs
@@ -30,7 +30,7 @@ public class StateEnable : IStateEnable
 
     public bool Assign(IEntity entity)
     {
-        if (_entity is not null) // TODO: Add IInitialize to IAssignable or IEntity maybe?
+        if (_entity.Initialized)
             return false;
 
         _entity = entity;