Adjusted required and optional arguments in correspondence to the XSDs