Improved avatar management