Updated UML Class Diagram