--- a/artifacts/src/main/java/org/dive4elements/river/exports/extreme/ExtremeWQCurveGenerator.java	Tue Jun 05 19:10:38 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/extreme/ExtremeWQCurveGenerator.java	Tue Jun 05 19:21:16 2018 +0200
@@ -19,6 +19,7 @@
 import org.jfree.data.xy.XYSeries;
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.access.FixAnalysisAccess;
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.model.DateRange;
@@ -114,7 +115,7 @@
     ) {
         log.debug("doExtremeCurveBaseOut");
         ExtremeCurveFacet facet = (ExtremeCurveFacet) aaf.getFacet();
-        Curve curve = (Curve) facet.getData(aaf.getArtifact(), context);
+        Curve curve = (Curve) facet.getData(aaf.getArtifact(), getContext());
         if (curve == null) {
             log.warn("doExtremeCurveBaseOut: Facet does not contain Curve");
             return;
@@ -155,7 +156,7 @@
     ) {
         log.debug("doExtremeCurveOut");
         ExtremeCurveFacet facet = (ExtremeCurveFacet) aaf.getFacet();
-        Curve curve = (Curve) facet.getData(aaf.getArtifact(), context);
+        Curve curve = (Curve) facet.getData(aaf.getArtifact(), getContext());
         if (curve == null) {
             log.warn("doExtremeCurveOut: Facet does not contain Curve");
             return;
@@ -189,29 +190,29 @@
 
 
     @Override
-    protected String getChartTitle() {
+    protected String getChartTitle(final CallContext context) {
         return Resources.format(
-                context.getMeta(),
+                getContext().getMeta(),
                 I18N_CHART_TITLE,
                 I18N_CHART_TITLE_DEFAULT,
-                context.getContextValue(CURRENT_KM));
+                getContext().getContextValue(CURRENT_KM));
     }
 
 
     @Override
-    protected String getDefaultChartTitle() {
+    protected String getDefaultChartTitle(final CallContext context) {
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
     @Override
-    protected String getDefaultChartSubtitle() {
+    protected String getDefaultChartSubtitle(final CallContext context) {
         FixAnalysisAccess access = new FixAnalysisAccess(artifact);
         DateRange dateRange = access.getDateRange();
         DateRange refRange  = access.getReferencePeriod();
 
         if (dateRange != null && refRange != null) {
             return Resources.format(
-                    context.getMeta(),
+                    getContext().getMeta(),
                     I18N_CHART_SUBTITLE,
                     "",
                     access.getRiverName(),
@@ -225,8 +226,8 @@
     }
 
     @Override
-    protected void addSubtitles(JFreeChart chart) {
-        String defaultSubtitle = getDefaultChartSubtitle();
+    protected void addSubtitles(final CallContext context, JFreeChart chart) {
+        String defaultSubtitle = getDefaultChartSubtitle(context);
 
         if (defaultSubtitle == null || defaultSubtitle.length() == 0) {
             return;
@@ -236,13 +237,13 @@
     }
 
     @Override
-    protected String getDefaultXAxisLabel() {
+    protected String getDefaultXAxisLabel(final CallContext context) {
         return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL_DEFAULT);
     }
 
     @Override
     protected String getDefaultYAxisLabel(int pos) {
-        D4EArtifact flys = (D4EArtifact) master;
+        D4EArtifact flys = getArtifact();
 
         String unit = RiverUtils.getRiver(flys).getWstUnit().getName();
         if (pos == 0) {