changes to Indexer