Added more GrammarBuilder features.