[Issue @77][WIP] Fixed UMLs