[Issue #85] [WIP] modifies UML