[Issue #77][Issue #205] Fixed UMLs