Updated grammar to reflect GPB.