Indexer speed up