Added support for Player class througout client