More changes for abtracting the index