Indexer logic updated