updated grammar to better support - class.