Added indexer code, it is not used (WIP)