Added avatar extraction