improved Indexer implementation to allow proxies on Indexer