PlayerAvatar/User refactoring
PlayerAvatar/User refactoring
PlayerAvatar/User refactoring