Add new tokenizer, which will be more efficiant. But not used yet.