Updated tokenizer.