[WIP][issue #369]UML and code modified