Added untested indexer code