Better multi-thread support in indexer