Minor update class GrammarGenerator