Updated grammar to prepare for code rewrite