use Avatar instead of SerializedAvatar