--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java	Tue Jun 05 19:10:38 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java	Tue Jun 05 19:21:16 2018 +0200
@@ -111,7 +111,7 @@
     ) {
         log.debug("doSectorAverageOut");
         QWDDateRange qwdd = (QWDDateRange)bundle.getData(
-            generator.getCallContext());
+            generator.getContext());
         QWD qwd = qwdd != null ? qwdd.getQWD() : null;
 
         if(qwd != null) {
@@ -154,7 +154,7 @@
     ) {
         log.debug("doAnalysisEventsOut");
 
-        QWD qwd = (QWD)bundle.getData(generator.getCallContext());
+        QWD qwd = (QWD)bundle.getData(generator.getContext());
 
         if (qwd == null) {
             log.debug("doAnalysisEventsOut: qwd == null");
@@ -206,7 +206,7 @@
         boolean visible) {
         log.debug("doReferenceEventsOut");
 
-        QWI qwd = (QWI)bundle.getData(generator.getCallContext());
+        QWI qwd = (QWI)bundle.getData(generator.getContext());
         if (qwd == null) {
             log.debug("doReferenceEventsOut: qwds == null in "
                 + bundle.getFacetDescription());
@@ -259,7 +259,7 @@
 
         FixWQCurveFacet facet = (FixWQCurveFacet)bundle.getFacet();
         FixFunction func = (FixFunction)facet.getData(
-                bundle.getArtifact(), generator.getCallContext());
+                bundle.getArtifact(), generator.getContext());
 
         if (func == null) {
             log.warn("doWQCurveOut: Facet does not contain FixFunction");
@@ -292,7 +292,7 @@
     ) {
         log.debug("doOutlierOut");
 
-        QWI[] qws = (QWI[])bundle.getData(generator.getCallContext());
+        QWI[] qws = (QWI[])bundle.getData(generator.getContext());
         if(qws != null) {
             XYSeries series = new StyledXYSeries(
                 bundle.getFacetDescription(),
@@ -338,7 +338,7 @@
             return;
         }
 
-        Object qsectorsObj = bundle.getData(generator.getCallContext());
+        Object qsectorsObj = bundle.getData(generator.getContext());
         if (qsectorsObj == null || !(qsectorsObj instanceof List)) {
             log.warn("No QSectors coming from data.");
             return;
@@ -405,7 +405,7 @@
         ThemeDocument    theme,
         boolean          visible
     ) {
-        Object data = bundle.getData(generator.getCallContext());
+        Object data = bundle.getData(generator.getContext());
         List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
         if (data instanceof double[][]) {
             log.debug("Got double[][]");
@@ -430,7 +430,7 @@
             WKms wkms = (WKms) data;
 
             Double ckm =
-                (Double)generator.getCallContext().getContextValue(
+                (Double)generator.getContext().getContextValue(
                     FixChartGenerator.CURRENT_KM);
             double location = (ckm != null)
                     ? ckm.doubleValue()
@@ -454,14 +454,14 @@
         ThemeDocument    theme,
         boolean          visible
     ) {
-        Object data = bundle.getData(generator.getCallContext());
+        Object data = bundle.getData(generator.getContext());
         if (data instanceof WQKms) {
             WQKms wqkms = (WQKms)data;
             // TODO As in doEventsOut, the value-searching should
             // be delivered by the facet already
             XYSeries series = new StyledXYSeries(
                 bundle.getFacetDescription(), theme);
-            Double ckm = (Double) generator.getCallContext()
+            Double ckm = (Double) generator.getContext()
                 .getContextValue(CURRENT_KM);
 
             if (wqkms == null || wqkms.getKms().length == 0 || ckm == null) {
@@ -525,7 +525,7 @@
 
     @Override
     public String getAxisLabel(DiagramGenerator generator) {
-        CallMeta meta = generator.getCallContext().getMeta();
+        CallMeta meta = generator.getContext().getMeta();
 
         RiverAccess access = new RiverAccess((D4EArtifact)generator
             .getMaster());