Re-check in the xsd/cmd files to address CR