[Issue #205][WIP] Fixed UML