Greatly expanded grammar to encompass more language features