Global Indexer enhancements