Diagramme edited like discussed with Martin (Architect)