UML

UML improvements