Started moving all entities to an inherited system