Updated lexer frontend