Added additional lexer definitions