Added Indexer, moved Query to Indexer