Updated working player class