diff --git a/config/test-default.groovy b/config/test-default.groovy
index 58a59764..32554fba 100644
--- a/config/test-default.groovy
+++ b/config/test-default.groovy
@@ -18,6 +18,11 @@ import cz.siret.prank.program.params.Params
 
     log_to_console = false
 
+
     rf_flatten = true
 
+    rf_flatten_as_legacy = true
+
+    rf_batch_prediction = true
+
 }
diff --git a/config/train-default.groovy b/config/train-default.groovy
index 3ab18048..cfc745c9 100644
--- a/config/train-default.groovy
+++ b/config/train-default.groovy
@@ -84,8 +84,10 @@ import cz.siret.prank.program.params.Params
 
 //===========================================================================================================//
 
-    rf_flatten = false
+    rf_flatten = true
 
-    rf_batch_prediction = false
+    rf_flatten_as_legacy = true
+
+    rf_batch_prediction = true
 
 }