DAR-1714: Move logic to AvatarService