Issue #250, update UML