More indexer refactoring