Issue #96 restored UMLs