Added selective avatar support