System, SystemManager, Entity, EntityManager changes