Add grammar and model changes