Issue #73 re-add UML