Preparing to refactor AvatarData