diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java
index 82ecac5d44fcc13073ed9536241e3f547024f939..2528b8faee9a316417a7182709fb104f703ca216 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * DBEndpoint
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class DBEndpoint   {
   @JsonProperty("ipAddress")
   private String ipAddress = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java
index 951fe1e723ebdf097aeda339d4a3ec4477a3c01a..ea4de2bd1b069516a88805b19ec567040da93333 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java
@@ -22,7 +22,7 @@ import javax.validation.constraints.*;
  * a list of the database endpoints  to issue the  workload
  */
 @ApiModel(description = "a list of the database endpoints  to issue the  workload")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class DBEndpoints extends java.util.ArrayList<DBEndpoint>  {
 
   @Override
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java
index da2a8de1e4052a8475528440b2f0e53fbb4f3ad6..f4c79693e54778fc59c4b246b029208676e4b5a5 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * DatabaseConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class DatabaseConfig   {
   /**
    * Gets or Sets databaseBinding
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java
index 13a34ceb9b651afb825f609db091d297e1f45cc9..01667ec475596a5ff84fb4e04ab3a05e4aaa4d45 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * DatabaseConfigProperty
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class DatabaseConfigProperty   {
   @JsonProperty("name")
   private String name = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java
index 77a1f18296c073a587fdf1ae57f69dffe95a4a1a..eea6f50db01ae6a105f1c84ff42a905a58013107 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * Error
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class Error   {
   @JsonProperty("code")
   private Integer code = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java
index a6adf31403d50e60558caea887b7b5a9046b11e6..3d8315de0574b5420ef449cda1ae3100147b817d 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.*;
 /**
  * MeasurementConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class MeasurementConfig   {
   @JsonProperty("interval")
   private Integer interval = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java
index 0f8cad799080144b8961bf8de72931ebe6c04d09..940924e4c7051b1cabbe79ac02c9da67b1cd73de 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * TPCCWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TPCCWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java
index b0ecb5990e5527df577d95a1abfb1b33a8de8b8d..cb0cb1ada7d3a9f16950ed8b7b162cea1d0ca41d 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * TPCCWorkloadConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TPCCWorkloadConfig   {
   @JsonProperty("activeWarehouses")
   private Integer activeWarehouses = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java
index e63ad6ffbd0ec316801c123641f306ac82394b46..ccd2a3c064662c18c09adf6e74a2c1f8a016d35b 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
  * parameters for the data generation phase
  */
 @ApiModel(description = "parameters for the data generation phase")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TSBSDataGeneration   {
   @JsonProperty("usecase")
   private String usecase = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java
index ca39bedba45bd689304911a9c1e07e9edfe8de8b..78947295c4ccd675d52b3fbf0d994e0bed792165 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * TSBSLoadExecution
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TSBSLoadExecution   {
   @JsonProperty("workers")
   private BigDecimal workers = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java
index 4edf83a78c21e9b6714adfe720b5ca7399b8b2fc..801fb0a764e3f7b50111f5e2c42db57d767418e8 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java
@@ -25,20 +25,11 @@ import javax.validation.constraints.*;
 /**
  * TSBSQueryExecution
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TSBSQueryExecution   {
   @JsonProperty("workers")
   private BigDecimal workers = null;
 
-  @JsonProperty("batchSize")
-  private BigDecimal batchSize = null;
-
-  @JsonProperty("dbName")
-  private String dbName = null;
-
-  @JsonProperty("reportingPeriod")
-  private String reportingPeriod = null;
-
   @JsonProperty("dbmsPorperties")
   private java.util.List<TSDBMSDBMSProperties> dbmsPorperties = null;
 
@@ -61,63 +52,6 @@ public class TSBSQueryExecution   {
     this.workers = workers;
   }
 
-  public TSBSQueryExecution batchSize(BigDecimal batchSize) {
-    this.batchSize = batchSize;
-    return this;
-  }
-
-  /**
-   * The batch size to use for inserting the data
-   * @return batchSize
-   **/
-  @JsonProperty("batchSize")
-  @ApiModelProperty(example = "1000.0", value = "The batch size to use for inserting the data")
-  public BigDecimal getBatchSize() {
-    return batchSize;
-  }
-
-  public void setBatchSize(BigDecimal batchSize) {
-    this.batchSize = batchSize;
-  }
-
-  public TSBSQueryExecution dbName(String dbName) {
-    this.dbName = dbName;
-    return this;
-  }
-
-  /**
-   * The DB to use for the benchmark will be created automatically
-   * @return dbName
-   **/
-  @JsonProperty("dbName")
-  @ApiModelProperty(example = "benchmark", value = "The DB to use for the benchmark will be created automatically")
-  public String getDbName() {
-    return dbName;
-  }
-
-  public void setDbName(String dbName) {
-    this.dbName = dbName;
-  }
-
-  public TSBSQueryExecution reportingPeriod(String reportingPeriod) {
-    this.reportingPeriod = reportingPeriod;
-    return this;
-  }
-
-  /**
-   * metric reporting interval
-   * @return reportingPeriod
-   **/
-  @JsonProperty("reportingPeriod")
-  @ApiModelProperty(example = "10s", value = "metric reporting interval")
-  public String getReportingPeriod() {
-    return reportingPeriod;
-  }
-
-  public void setReportingPeriod(String reportingPeriod) {
-    this.reportingPeriod = reportingPeriod;
-  }
-
   public TSBSQueryExecution dbmsPorperties(java.util.List<TSDBMSDBMSProperties> dbmsPorperties) {
     this.dbmsPorperties = dbmsPorperties;
     return this;
@@ -156,15 +90,12 @@ public class TSBSQueryExecution   {
     }
     TSBSQueryExecution tsBSQueryExecution = (TSBSQueryExecution) o;
     return Objects.equals(this.workers, tsBSQueryExecution.workers) &&
-        Objects.equals(this.batchSize, tsBSQueryExecution.batchSize) &&
-        Objects.equals(this.dbName, tsBSQueryExecution.dbName) &&
-        Objects.equals(this.reportingPeriod, tsBSQueryExecution.reportingPeriod) &&
         Objects.equals(this.dbmsPorperties, tsBSQueryExecution.dbmsPorperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(workers, batchSize, dbName, reportingPeriod, dbmsPorperties);
+    return Objects.hash(workers, dbmsPorperties);
   }
 
 
@@ -174,9 +105,6 @@ public class TSBSQueryExecution   {
     sb.append("class TSBSQueryExecution {\n");
     
     sb.append("    workers: ").append(toIndentedString(workers)).append("\n");
-    sb.append("    batchSize: ").append(toIndentedString(batchSize)).append("\n");
-    sb.append("    dbName: ").append(toIndentedString(dbName)).append("\n");
-    sb.append("    reportingPeriod: ").append(toIndentedString(reportingPeriod)).append("\n");
     sb.append("    dbmsPorperties: ").append(toIndentedString(dbmsPorperties)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java
index d26c9bc21af4bf2ea28b51575633c678f5de3b36..97384878914b7154f2d3402ef4b0d82e3b9695e6 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
  * parameters for the query generation phase
  */
 @ApiModel(description = "parameters for the query generation phase")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TSBSQueryGeneration   {
   @JsonProperty("usecase")
   private String usecase = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java
index d325d3343c93cb56bc5ae05f22ff9d28fdd07879..db4e3e2fca4b6327ae2d302252a65250aa48962e 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java
@@ -29,7 +29,7 @@ import javax.validation.constraints.*;
 /**
  * TSBSWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TSBSWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java
index d993e9e58a05885276c87d89a864ea977343840d..d4e9f76c2fc82ab6bfb297edcacf1cd3bb75db36 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * TSDBMSDBMSProperties
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class TSDBMSDBMSProperties   {
   @JsonProperty("name")
   private String name = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java
index a95a383fc6f74b4d9f0c630da78f281696270a4a..29393453142d6c4bb043490f38f9bd0ec01a29ba 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.*;
 /**
  * WorkloadConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class WorkloadConfig   {
   /**
    * Gets or Sets workloadType
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java
index d64cbd140303da409c2ab85a0c3c5e664d757f0d..1964aab257fced26d7cde48a37e6716fff3511c5 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * WorkloadProcessInstance
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class WorkloadProcessInstance   {
   @JsonProperty("processId")
   private String processId = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java
index 3506c12c48186d914646695953c73ed1e20feb95..793ee21d23e74e39d4c64af242b58fd485144f8b 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * WorkloadProcessSubmissionError
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class WorkloadProcessSubmissionError   {
   @JsonProperty("message")
   private String message = null;
diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java
index a4ab33509c4f42186f504cda947255fbd82010eb..57919ffafabf786aac6d6d27a21afc506888d714 100644
--- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java
+++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java
@@ -27,7 +27,7 @@ import javax.validation.constraints.*;
 /**
  * YCSBWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class YCSBWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java
index 1f00e5a0e322db3595b002c59cdd816e6c647788..68fb805f59b09e3bbe599fa4ff2fad57788b6d2c 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java
@@ -1,6 +1,6 @@
 package de.uulm.omi.dbms.workload.api;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java
index fac38d3a2ac571c17d9633d5e3fbfbfd8351a045..a0c87656b558cec94637bed1efb494a3038f8a4f 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java
index e99d7be5d6bda191f4b1976d736dc7d9ee17c016..698f0a229cb7d31f0c958bbde143af26d7884e14 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@ package de.uulm.omi.dbms.workload.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java b/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java
index eef9594e394e10ab142014fa9d0d82b3891e8d63..f61ad97331d92e10b79b59a900ed63dd05787e2c 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package de.uulm.omi.dbms.workload.api;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java b/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java
index 5d97b5214bd9e0b8882239394cf5250f0aacb628..3797742b119cfb92d15ecbe09b7f571e36810b12 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java
@@ -1,6 +1,6 @@
 package de.uulm.omi.dbms.workload.api;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java
index 695a887d70310e4068a39676bb8a6be479d6e804..1c06060f5f7212c47606f8ceba9f435907e7d84c 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java
@@ -35,7 +35,7 @@ import javax.validation.constraints.*;
 
 @Produces({ "application/json" })
 @io.swagger.annotations.Api(description = "the workload API")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class WorkloadApi  {
    private final WorkloadApiService delegate;
 
diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java
index 8f984da020cab2257ddfa933a527deac8f9ff18a..185ee38ded3b736d029609928c7df1c49e640851 100644
--- a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java
+++ b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public abstract class WorkloadApiService {
     public abstract Response workloadResultGet( @NotNull String taskId, @NotNull String workloadType,SecurityContext securityContext) throws NotFoundException;
     public abstract Response workloadStatusGet( String applicationInstanceId,SecurityContext securityContext) throws NotFoundException;
diff --git a/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java b/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java
index b80b633fb3c8edef6a9a0db6d56b64f215ae275d..95b9fc0b69f9fce2d7707582f914b183a09c53fa 100644
--- a/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java
+++ b/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java
@@ -3,7 +3,7 @@ package de.uulm.omi.dbms.workload.api.factories;
 import de.uulm.omi.dbms.workload.api.WorkloadApiService;
 import de.uulm.omi.dbms.workload.api.impl.WorkloadApiServiceImpl;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00")
 public class WorkloadApiServiceFactory {
     private final static WorkloadApiService service = new WorkloadApiServiceImpl();
 
diff --git a/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java b/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java
index 948ca25c9e57e41f1ad6245231662da9e687864d..23298a51ba033d754dbdb485604a15427dd770a1 100644
--- a/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java
+++ b/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java
@@ -190,25 +190,11 @@ public class TSBSCommandBuilder {
         String queriesCommand = "cat " + queryFolder +  dbms.toString() + "-queries.gz "   + " | gunzip | " + binaryPath + "tsbs_run_queries_" + dbms.toString() + " ";
 
         //common parameters
-        if (tsbsQueryExecution.getDbName() != null){
-            queriesCommand += "--db-name=\"" + tsbsQueryExecution.getDbName().toLowerCase()+ "\" ";
-        }
-        else throw new IllegalArgumentException("Missing or incorrect --db-name parameter!");
-
         if (tsbsQueryExecution.getWorkers() != null){
             queriesCommand += "--workers=\"" + tsbsQueryExecution.getWorkers()+ "\" ";
         }
         else throw new IllegalArgumentException("Missing or incorrect --workers parameter!");
 
-        if (tsbsQueryExecution.getReportingPeriod() != null){
-            queriesCommand += "--reporting-period=\"" + tsbsQueryExecution.getReportingPeriod()+ "\" ";
-        }
-        else throw new IllegalArgumentException("Missing or incorrect --reporting-period parameter!");
-
-        if (tsbsQueryExecution.getBatchSize() != null){
-            queriesCommand += "--batch-size=\"" + tsbsQueryExecution.getBatchSize()+ "\" ";
-        }
-        else throw new IllegalArgumentException("Missing or incorrect --batch-size parameter!");
 
         //DBMS specific parameters
         if(dbms.equals(DbmsEnum.INFLUX)){
diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml
index 441f7ca52410c210c1bfeae758c020d162711146..9a3aa6cf552c08aca1d81f4cf74b60cb738120ed 100644
--- a/swagger/swagger.yaml
+++ b/swagger/swagger.yaml
@@ -149,6 +149,8 @@ paths:
           type: string
           enum:
             - YCSB
+            - TPCC
+            - TSBS
           required: true
       responses:
         '200':
@@ -624,19 +626,6 @@ definitions:
         format: int32
         description: 'number of worker to execute the workload'
         example: 4
-      batchSize:
-        type: number
-        format: int32
-        description: 'The batch size to use for inserting the data'
-        example: 1000
-      dbName:
-         type: string
-         description: 'The DB to use for the benchmark will be created automatically'
-         example: 'benchmark'
-      reportingPeriod:
-         type: string
-         description: 'metric reporting interval'
-         example: '10s'
       dbmsPorperties:
         type: array
         items: