[Issue #370][WIP] Fixed UML