Better tokenizer usability