Indexer feature completed