FIX: avatar_url should only be a custom field