Added basic avatar support