Updated grammar to match spec