MarkingType/Controlled_Structure and MarkingType/Marking_Structure chang...

...ed to optional
Close issue #44