Added changes to avatars system