Tokenizer improvements