More changes for abstracting indexes