Tokenizer separation implemented #384