[Issue #186] finished UML