Additional changes for abstracting the index