[Issue #92] Fixed uml