Added player and entity hierarchy