Updates to grammar