Adjusted the grammar to allow option definitions