More UML updates.