More changes to Index