Replaced old parser with new Lexer