--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveProcessor.java	Mon Jul 16 08:41:51 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveProcessor.java	Mon Jul 16 08:43:07 2018 +0200
@@ -13,15 +13,13 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.DurationCurveGenerator;
-import org.dive4elements.river.exports.XYChartGenerator;
 import org.dive4elements.river.exports.process.DefaultProcessor;
-import org.dive4elements.river.themes.ThemeDocument;
 
 /**
  * Processor to generate the facet and data series of a flood duration curve
@@ -31,13 +29,15 @@
  */
 public final class FloodDurationCurveProcessor extends DefaultProcessor {
 
-    private static final String FACET_FLOOD_DURATION_W = "duration_curve.w";
+    private static final String FACET_FLOOD_DURATION_W = FacetTypes.DURATION_W; // "duration_curve.w";
 
-    private static final String FACET_FLOOD_DURATION_Q = "duration_curve.q";
+    private static final String FACET_FLOOD_DURATION_Q = FacetTypes.DURATION_Q; // "duration_curve.q";
 
-    private static final String FACET_FLOOD_DURATION_MAINVALUES_W = "mainvalues.w";
+    public static final String FACET_FLOOD_DURATION_MAINVALUES_W = "sinfo.mainvalues.w";
 
-    private static final String FACET_FLOOD_DURATION_MAINVALUES_Q = "mainvalues.q";
+    public static final String FACET_FLOOD_DURATION_MAINVALUES_Q = "sinfo.mainvalues.q";
+
+    public static final String FACET_FLOOD_DURATION_INFRASTRUCTURE = "infrastructure.wq";
 
     private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
 
@@ -46,6 +46,7 @@
         HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION_Q);
         HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION_MAINVALUES_W);
         HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION_MAINVALUES_Q);
+        HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION_INFRASTRUCTURE);
     }
 
     public static Facet createFloodDurationWCurveFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
@@ -72,12 +73,10 @@
         return new FloodDurationMainValuesQFacet(FACET_FLOOD_DURATION_MAINVALUES_Q, description);
     }
 
-    /**
-     * Processes data to generate a chart.
-     */
-    @Override
-    public void doOut(final XYChartGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible, final int index) {
+    public static Facet createInfrastructureWFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
+            final int facetIndex, final int resultIndex, final String description) {
 
+        return new FloodDurationInfrastructureFacet(FACET_FLOOD_DURATION_INFRASTRUCTURE, description);
     }
 
     @Override