Update to Indexer Class