Added lexer