Small changes in the Model class diagramm