annotated XSD, CM reformatting