Made indexer much faster