diff --git a/images/class-diagram.png b/images/class-diagram.png
index 2ff3b8a..d6597d2 100644
Binary files a/images/class-diagram.png and b/images/class-diagram.png differ
diff --git a/images/class-diagram.puml b/images/class-diagram.puml
index 060ccb8..bb56f24 100644
--- a/images/class-diagram.puml
+++ b/images/class-diagram.puml
@@ -89,7 +89,7 @@ class Participant #IMPLEMENTED_COLOR {
   +setMasterRecord(masterRecord: MasterRecord): void
 }
 
-class WineProperty #IMPLEMENTED_COLOR {
+class WineKind #IMPLEMENTED_COLOR {
   -uid: Int
   -name: String
   -description: String
@@ -112,11 +112,12 @@ class Wine #IMPLEMENTED_COLOR {
   -vintage: int
   -quality: int
   -taste: String
-  -properties: List<WineProperty>
+  -winekinds: List<WineKind>
   -ap_nr: String
   -acidity: float
   -sugar: float
   -alc: float
+  -volume: float
   -price: float
   -status: String
   +getUid(): Int
@@ -139,8 +140,8 @@ class Wine #IMPLEMENTED_COLOR {
   +setQuality(quality: int): void
   +getTaste(): String
   +setTaste(taste: String): void
-  +getProperties(): List<WineProperty>
-  +setProperties(properties: List<WineProperty>): void
+  +getWinekinds(): List<Winekind>
+  +setWinekinds(winekinds: List<WineKind>): void
   +getApNr(): String
   +setApNr(ap_nr: String): void
   +getAcidity(): float
@@ -149,6 +150,8 @@ class Wine #IMPLEMENTED_COLOR {
   +setSugar(sugar: float): void
   +getAlc(): float
   +setAlc(alc: float): void
+  +getVolume(): float
+  +setVolume(volume: float): void
   +getPrice(): float
   +setPrice(price: float): void
   +getStatus(): String
@@ -196,7 +199,7 @@ Category "1" <-- "*" Wine
 Grape "1" <-- "*" Wine
 Vinesite "1" <-- "*" Wine
 Participant "1" <-- "*" Wine
-WineProperty "1" <-- "*" Wine
+WineKind "1" <-- "*" Wine
 Jahresauswahlprobe "*" <-- "*" Wine
 
 legend right