#1
Simplify data model
Data model and parsing simplified.
#1
Simplify data model
Nouns from GrammarUtil moved to Nouns ENUM.