Some changes to PlayerManager