Updated Class Diagram!