[Issue #205][WIP] Fixed UMLs
[Issue #205][WIP] Fixed UMLs