Fixed class diagramm