[Issue 183] [WIP] modifies UML