Changes to Player implementation.