Working on a new better Class Diagram