Added support for entities and added a player