improve class diagramm