[WIP][issue #83] UML added