Updated UML Diagram