Updated grammar from parser