Issue #46 , UML modified