Issue #52, update UML