[Issue #92] Fixed UML