Added Entity/Npc/Player & EntityManager