Added more to the grammar.