[Issue #370][WIP] Modified UML