Issue #73 new UML