added avatar support