Updated lexer rules