[Issue #193] Fixed uml