Some UML Class Diagram changes