Updated grammar spec