Updated grammar to support behavioral transitions