Improve avatar support