Class Diagram redesign