Working on new Class Diagram