--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculationResult.java	Thu Jun 21 10:41:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculationResult.java	Thu Jun 21 14:32:11 2018 +0200
@@ -12,11 +12,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 import org.dive4elements.river.artifacts.common.ExportContextCSV;
 import org.dive4elements.river.artifacts.common.GeneralResultType;
 import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.common.ResultRow;
+import org.dive4elements.river.artifacts.sinfo.common.AbstractTkhCalculationResult;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
 import org.dive4elements.river.artifacts.sinfo.util.WstInfo;
@@ -26,21 +26,18 @@
  *
  * @author Gernot Belger
  */
-final class TkhCalculationResult extends AbstractCalculationExportableResult<TkhCalculationResults> {
+final class TkhCalculationResult extends AbstractTkhCalculationResult<TkhCalculationResults> {
 
     private static final long serialVersionUID = 1L;
     private static final String JASPER_FILE = "/jasper/templates/sinfo.tkh.jrxml";
-    private final boolean hasTkh;
-    private final WstInfo wst;
 
     private enum ExportMode {
         pdf, csv
     }
 
     public TkhCalculationResult(final String label, final WstInfo wst, final boolean hasTkh, final Collection<ResultRow> rows) {
-        super(label, rows);
-        this.hasTkh = hasTkh;
-        this.wst = wst;
+        super(label, wst, hasTkh, rows);
+
     }
 
     @Override
@@ -68,7 +65,7 @@
 
     @Override
     protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final TkhCalculationResults results) {
-        exportContextCSV.writeCSVWaterlevelMetadata(this.wst);
+        exportContextCSV.writeCSVWaterlevelMetadata(super.getWst());// TODO: move to super
         exportContextCSV.writeBlankLine();
     }