Updated UML design