add in avatar support