UML diagram updated, v2.