Update with lexer and parser