Updated UMLs to fit better