[WIP][issue #368]UML modified