--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResults.java	Mon Jul 16 08:41:51 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResults.java	Mon Jul 16 08:43:07 2018 +0200
@@ -9,11 +9,14 @@
  */
 package org.dive4elements.river.artifacts.sinfo.flood_duration;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.lang.math.DoubleRange;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResults;
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
-import org.dive4elements.river.jfree.RiverAnnotation;
+import org.dive4elements.river.jfree.StickyAxisAnnotation;
 
 /**
  * @author Gernot Belger
@@ -24,6 +27,8 @@
 
     public FloodDurationCalculationResults(final String calcModeLabel, final String user, final RiverInfo river, final DoubleRange calcRange) {
         super(calcModeLabel, user, river, calcRange);
+        this.mainValueWAnnotations = new ArrayList<>();
+        this.mainValueQAnnotations = new ArrayList<>();
     }
 
     private CalculationResult durationCurve;
@@ -36,23 +41,35 @@
         this.durationCurve = durationCurve;
     }
 
-    private RiverAnnotation mainValueWAnnotation;
+    private final List<StickyAxisAnnotation> mainValueWAnnotations;
 
-    public RiverAnnotation getMainValueWAnnotation() {
-        return this.mainValueWAnnotation;
-    }
-
-    public void setMainValueWAnnotation(final RiverAnnotation mainValueAnnotation) {
-        this.mainValueWAnnotation = mainValueAnnotation;
+    public List<StickyAxisAnnotation> getMainValueWAnnotations() {
+        return this.mainValueWAnnotations;
     }
 
-    private RiverAnnotation mainValueQAnnotation;
+    private final List<StickyAxisAnnotation> mainValueQAnnotations;
 
-    public RiverAnnotation getMainValueQAnnotation() {
-        return this.mainValueQAnnotation;
+    public List<StickyAxisAnnotation> getMainValueQAnnotations() {
+        return this.mainValueQAnnotations;
     }
 
-    public void setMainValueQAnnotation(final RiverAnnotation mainValueAnnotation) {
-        this.mainValueQAnnotation = mainValueAnnotation;
+    private StickyAxisAnnotation infrastructureWAnnotation;
+
+    public StickyAxisAnnotation getInfrastructureWAnnotation() {
+        return this.infrastructureWAnnotation;
+    }
+
+    public void setInfrastructureWAnnotation(final StickyAxisAnnotation infrastructureWAnnotation) {
+        this.infrastructureWAnnotation = infrastructureWAnnotation;
+    }
+
+    private StickyAxisAnnotation infrastructureQAnnotation;
+
+    public StickyAxisAnnotation getInfrastructureQAnnotation() {
+        return this.infrastructureQAnnotation;
+    }
+
+    public void setInfrastructureQAnnotation(final StickyAxisAnnotation infrastructureQAnnotation) {
+        this.infrastructureQAnnotation = infrastructureQAnnotation;
     }
 }
\ No newline at end of file