Updated the Tokenizer