refactored indexer, added to pipeline