[WIP][issue #367]UML finished