Add indexer and tokenizer