adding support for avatars