Added entities and player control