More UML changes