Need to re-add lexer as Lexer