annotated schema, CM reformatting