UML Updates

General updates