Added some new features that need a slightly different grammar format