Added extra indexes