Indexer refactoring