Tokenizer changes (WIP)