[WIP][issue #178] UML added