diff --git a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
index c3d1de874308576c07f27304e167f56a85bc6605..6f6e7745459889f8467d6f0013ba11426f585498 100644
--- a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
@@ -132,6 +132,7 @@ public class ModelsApi {
         saveVariables(model.getQuery().getVariables());
         saveVariables(model.getQuery().getCovariables());
         saveVariables(model.getQuery().getGrouping());
+	saveVariables(model.getQuery().getTrainingDatasets());
 
         configRepository.save(model.getConfig());
         queryRepository.save(model.getQuery());
@@ -270,6 +271,11 @@ public class ModelsApi {
         map.put("text", model.getTitle());
         model.getConfig().setTitle(map);
 
+        saveVariables(model.getQuery().getVariables());
+        saveVariables(model.getQuery().getCovariables());
+        saveVariables(model.getQuery().getGrouping());
+        saveVariables(model.getQuery().getTrainingDatasets());
+
         configRepository.save(model.getConfig());
         queryRepository.save(model.getQuery());
         datasetRepository.save(model.getDataset());