added switcher avatar support