[Issue #188] [WIP] modifies UML