More updates to UML