annotated XSD, new CM layout