Fix & Add returner of avatars property