Updated grammar to latest version of the parser