Some changes in lexer and token recognizer according to new grammar