Tokenizer modified
Token compat implemented
Tokenizer modified