Add support for avatars