Performance improvements, avatar support