Moved avatars to dependency