Updated Class Diagram (again)