UML updated to reflect changes