Update parser for new tokenizer