Updated UML chart