Changed structure to be coherent with Suggestion 2 of our UMLs