Updated UML

UML goodness