Updated Class Diagram