Added handling of players