Changed the structure of the Player class