Lexer enhancement