[Issue #92] Changed UML