Changes due to UMLGraph