maybe move this inside the Indexer