Tokenizer enhanced