add custom avatar support