Updated UML with new classes