Some UML changes.