Modified grammar to support my new syntax