Support for new lexer, fixed Type in lexer