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