annotated XSD and new CM layout