Updated Class Diagramm