Augmented grammar generation