Updated grammar format