More changes for abstracting the indexes