More changes to UML