Class Diagram Updated