Indexer Optimization Added