Updated UML diagram