[Issue #210 #75][MC] fixed UMLs