[WIP][issue #368] UML modified, and code cleaned