annotated XSD, reformatting CM