GrammarInfoParsing improved