More changes to indexes