--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionFacet.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionFacet.java	Tue Jul 03 17:00:48 2018 +0200
@@ -21,7 +21,6 @@
 import org.dive4elements.river.artifacts.common.GeneralResultType;
 import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.model.BlackboardDataFacet;
-import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.model.sinfo.Collision;
 import org.dive4elements.river.model.sinfo.CollisionAggregateValue;
@@ -31,12 +30,12 @@
  *
  * @author Matthias Schäfer
  */
-public class CollisionFacet extends BlackboardDataFacet implements FacetTypes {
+public class CollisionFacet extends BlackboardDataFacet {
 
     private static final long serialVersionUID = 1;
 
-    public CollisionFacet(final String name, final String description, final String yAxisLabel) {
-        super(0, name, description);
+    public CollisionFacet(final int facetIndex, final String name, final String description, final String yAxisLabel) {
+        super(facetIndex, name, description);
 
         this.metaData.put("X", "chart.longitudinal.section.xaxis.label");
         this.metaData.put("Y", yAxisLabel);
@@ -61,8 +60,15 @@
         final List<CollisionAggregateValue> values = CollisionAggregateValue.getValuesByKm(series, access.getFrom(true), access.getTo(true));
         final Collection<ResultRow> rows = new ArrayList<>();
         for (final CollisionAggregateValue value : values) {
-            rows.add(ResultRow.create().putValue(GeneralResultType.station, value.getStation()) //
-                    .putValue(SInfoResultType.collisionCount, value.getCount()).putValue(SInfoResultType.collisionGaugeW, value.getGaugeW()));
+
+            final ResultRow row = ResultRow.create();
+
+            row.putValue(GeneralResultType.station, value.getStation());
+            // Not needed: row.putValue(SInfoResultType.years, series.getYear());
+            row.putValue(SInfoResultType.collisionCount, value.getCount());
+            row.putValue(SInfoResultType.collisionGaugeW, value.getGaugeW());
+
+            rows.add(row);
         }
         return new DefaultCalculationResult(series.getFilename(), rows);
     }
@@ -74,7 +80,7 @@
      */
     @Override
     public CollisionFacet deepCopy() {
-        final CollisionFacet copy = new CollisionFacet(this.name, this.description, this.metaData.get("Y"));
+        final CollisionFacet copy = new CollisionFacet(this.index, this.name, this.description, this.metaData.get("Y"));
         copy.set(this);
         return copy;
     }