Refactor for indexer