Updated Game and Player Classes