Updated UML structure