[Issue #370][UML