Added entity hierarchy and player things