Tokenizer updated