--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixScenarioResultFacet.java	Tue Jul 31 15:48:35 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixScenarioResultFacet.java	Tue Jul 31 16:04:01 2018 +0200
@@ -8,48 +8,28 @@
 
 package org.dive4elements.river.artifacts.uinfo.salix;
 
-import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.Artifact;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.D4EArtifact;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResults;
-import org.dive4elements.river.artifacts.model.CalculationResult;
-import org.dive4elements.river.artifacts.model.DataFacet;
+import org.dive4elements.river.artifacts.common.ResultFacet;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 /**
  * Facet of the U-Info salix scenario curve.
  */
-public class SalixScenarioResultFacet extends DataFacet {
+public class SalixScenarioResultFacet extends ResultFacet {
 
     private static final long serialVersionUID = 1L;
 
-    private static Logger log = Logger.getLogger(SalixScenarioResultFacet.class);
-
-    private int resultIndex;
+    private int dataIndex;
 
     public SalixScenarioResultFacet() {
         // required for clone operation deepCopy()
     }
 
-    public SalixScenarioResultFacet(final String name, final String description, final int facetIndex, final String hash, final String id) {
-        super(facetIndex, name, description, ComputeType.ADVANCE, hash, id);
-    }
-
-    @Override
-    public final Object getData(final Artifact artifact, final CallContext context) {
+    public SalixScenarioResultFacet(final int facetIndex, final int resultIndex, final int dataIndex, final String name, final String description,
+            final String yAxisLabelKey, final String hash, final String id) {
+        super(facetIndex, resultIndex, name, description, yAxisLabelKey, ComputeType.ADVANCE, id, hash);
 
-        log.debug("Get data for result at index: " + this.resultIndex);
-
-        final D4EArtifact flys = (D4EArtifact) artifact;
-
-        final CalculationResult res = (CalculationResult) flys.compute(context, this.hash, this.stateId, this.type, false);
-
-        final AbstractCalculationResults<AbstractCalculationResult> data = (AbstractCalculationResults<AbstractCalculationResult>) res.getData();
-
-        return data.getResults().get(this.resultIndex);
+        this.dataIndex = dataIndex;
     }
 
     /** Copy deeply. */
@@ -62,6 +42,11 @@
         copy.type = this.type;
         copy.hash = this.hash;
         copy.stateId = this.stateId;
+        copy.dataIndex = this.dataIndex;
         return copy;
     }
+
+    public int getDataIndex() {
+        return this.dataIndex;
+    }
 }
\ No newline at end of file