Separate indexing utility, improve Indexer speed.