ADD TokenIndexer and related testcases