diff --git a/steps/ddecal.cwl b/steps/ddecal.cwl
index 454afeea330e8f457fccbc484cd4fb838bc33ce4..7e4f0b83bca59f80edd741ac71d87d428220054a 100644
--- a/steps/ddecal.cwl
+++ b/steps/ddecal.cwl
@@ -35,14 +35,6 @@ inputs:
       prefix: msin.datacolumn=
       separate: false
 
-  - id: msin_modelcolum
-    type: string?
-    default: MODEL_DATA
-    doc: Model data Column
-    inputBinding:
-      prefix: msin.modelcolumn=
-      separate: false
-
   - id: output_name_h5parm
     type: string?
     default: instrument.h5
@@ -68,11 +60,14 @@ inputs:
     default: true
     inputBinding:
       prefix: ddecal.propagateconvergedonly=True
-  - id: usemodelcolumn
-    type: boolean?
-    default: true
+  - id: modeldatacolumns
+    type: string[]?
+    default: []
     inputBinding:
-      prefix: ddecal.usemodelcolumn=True
+      prefix: ddecal.modeldatacolumns=
+      separate: false
+      valueFrom: "[$(self.join(','))]"
+      shellQuote: false
   - id: flagunconverged
     type: boolean?
     default: false
diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index 602e998c1fd99309076e371de519bc46b1e0d828..a989afee9020897ed28208641c13e2405b156000 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -88,9 +88,6 @@ inputs:
   - id: tables2export
     type: string?
     default: clock
-  - id: final_apply
-    type: boolean?
-    default: false
   - id: max_dppp_threads
     type: int?
     default: 10
@@ -200,8 +197,6 @@ steps:
         source: clock_smooth
       - id: tables2export
         source: tables2export
-      - id: final_apply
-        source: final_apply
       - id: max_dppp_threads
         source: max_dppp_threads
       - id: memoryperc
diff --git a/workflows/HBA_target.cwl b/workflows/HBA_target.cwl
index bf2ea2df733bd4579461cdb18b640fa308b177c7..f9a5507223d58a904a5f56e36b46bdc65fa80aa7 100644
--- a/workflows/HBA_target.cwl
+++ b/workflows/HBA_target.cwl
@@ -276,6 +276,8 @@ steps:
         source: clip_sources
       - id: ncores
         source: ncores
+      - id: gsmcal_step
+        source: gsmcal_step
     out:
       - id: logfiles
       - id: msout
diff --git a/workflows/LBA_calibrator.cwl b/workflows/LBA_calibrator.cwl
index f8457969d1cb0cd372519895e578e466af65e8d2..baf35ae2d40de7a11343ce5f6efb20ad38606f66 100644
--- a/workflows/LBA_calibrator.cwl
+++ b/workflows/LBA_calibrator.cwl
@@ -88,9 +88,6 @@ inputs:
   - id: tables2export
     type: string?
     default: phaseOrig
-  - id: final_apply
-    type: boolean?
-    default: false
   - id: max_dppp_threads
     type: int?
     default: 10
@@ -200,8 +197,6 @@ steps:
         source: clock_smooth
       - id: tables2export
         source: tables2export
-      - id: final_apply
-        source: final_apply
       - id: max_dppp_threads
         source: max_dppp_threads
       - id: memoryperc
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 775ffbba654104075ada8f6058a6a85e35184fcd..637da95382a42e50bf15cd99e3c25f4d5f747e62 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -87,9 +87,6 @@ inputs:
   - id: tables2export
     type: string?
     default: clock
-  - id: final_apply
-    type: boolean?
-    default: false
   - id: max_dppp_threads
     type: int?
     default: 10
diff --git a/workflows/prefactor_calibrator/apply_calibrate_bp.cwl b/workflows/prefactor_calibrator/apply_calibrate_bp.cwl
index 0553de826418377d45a635d26cad25f987c435bd..b68172344f6dcd8c25db998b236e1f9f1548c771 100644
--- a/workflows/prefactor_calibrator/apply_calibrate_bp.cwl
+++ b/workflows/prefactor_calibrator/apply_calibrate_bp.cwl
@@ -161,8 +161,9 @@ steps:
         source: BLsmooth/msout
       - id: msin_datacolumn
         default: SMOOTHED_DATA
-      - id: msin_modelcolum
-        default: MODEL_DATA
+      - id: modeldatacolumns
+        default: 
+          - 'MODEL_DATA'
       - id: propagate_solutions
         source: propagatesolutions
       - id: flagunconverged
diff --git a/workflows/prefactor_calibrator/apply_calibrate_fr.cwl b/workflows/prefactor_calibrator/apply_calibrate_fr.cwl
index e137916377b63bbfab9b850ab76f0ae2e9ff2c91..d7bd66787989f2d464345f5dbf547d0c928a403b 100644
--- a/workflows/prefactor_calibrator/apply_calibrate_fr.cwl
+++ b/workflows/prefactor_calibrator/apply_calibrate_fr.cwl
@@ -78,8 +78,9 @@ steps:
         source: BLsmooth/msout
       - id: msin_datacolumn
         default: SMOOTHED_DATA
-      - id: msin_modelcolum
-        default: MODEL_DATA
+      - id: modeldatacolumns
+        default: 
+          - 'MODEL_DATA'
       - id: flagunconverged
         source: flagunconverged
       - id: propagate_solutions
diff --git a/workflows/prefactor_calibrator/apply_calibrate_pa.cwl b/workflows/prefactor_calibrator/apply_calibrate_pa.cwl
index 781f954f17964b5fcadd97a0e9cb440f1df38332..dace8768a8f427a2ac1ef1254ade4d3b682417c1 100644
--- a/workflows/prefactor_calibrator/apply_calibrate_pa.cwl
+++ b/workflows/prefactor_calibrator/apply_calibrate_pa.cwl
@@ -109,8 +109,9 @@ steps:
         source: BLsmooth/msout
       - id: msin_datacolumn
         default: SMOOTHED_DATA
-      - id: msin_modelcolum
-        default: MODEL_DATA
+      - id: modeldatacolumns
+        default: 
+          - 'MODEL_DATA'
       - id: flagunconverged
         source: flagunconverged
       - id: propagate_solutions
diff --git a/workflows/prefactor_calibrator/predict_calibrate.cwl b/workflows/prefactor_calibrator/predict_calibrate.cwl
index 3956350eae8400d8c096de335b6de2130ccb62ff..99d585f5c63ca9636773e9e2ecf3e0cb7dbe2423 100644
--- a/workflows/prefactor_calibrator/predict_calibrate.cwl
+++ b/workflows/prefactor_calibrator/predict_calibrate.cwl
@@ -79,8 +79,9 @@ steps:
         source: predict/msout
       - id: msin_datacolumn
         default: SMOOTHED_DATA
-      - id: msin_modelcolum
-        default: MODEL_DATA
+      - id: modeldatacolumns
+        default: 
+          - 'MODEL_DATA'
       - id: propagate_solutions
         source: propagatesolutions
       - id: flagunconverged
diff --git a/workflows/prefactor_target/concat.cwl b/workflows/prefactor_target/concat.cwl
index 042327fec9e60eabcbcbd5c40415aa3d7c5974fc..d9e92babdf6add571c6900a37485b4e50265fa9d 100644
--- a/workflows/prefactor_target/concat.cwl
+++ b/workflows/prefactor_target/concat.cwl
@@ -18,9 +18,6 @@ inputs:
   - id: avg_freqresolution_concat
     type: string?
     default: '97.64kHz'
-  - id: min_unflagged_fraction
-    type: float?
-    default: 0.5
 outputs:
   - id: flagged_fraction_dict
     outputSource:
diff --git a/workflows/prefactor_target/finalize.cwl b/workflows/prefactor_target/finalize.cwl
index 33486c9305dfc05699e698c439346f79b55ba84e..d62f9a1e4230f42c10fd79af4fa207738a5fc160 100644
--- a/workflows/prefactor_target/finalize.cwl
+++ b/workflows/prefactor_target/finalize.cwl
@@ -178,8 +178,6 @@ steps:
         valueFrom: $(self.nameroot+'_wsclean.ms')
       - id: msin_datacolumn
         default: DATA
-      - id: msout_datacolumn
-        default: DATA
       - id: overwrite
         default: false
       - id: storagemanager
@@ -267,7 +265,7 @@ steps:
         default: 15asec
       - id: auto_threshold
         default: 5
-      - id: size
+      - id: image_size
         default: [2500,2500]
       - id: niter
         default: 10000
diff --git a/workflows/prefactor_target/gsmcal.cwl b/workflows/prefactor_target/gsmcal.cwl
index 0e769b6cd5de86be85f790a392e56e1e956c122c..affefcec616e8e7b2b60e77916009ea421f93431 100644
--- a/workflows/prefactor_target/gsmcal.cwl
+++ b/workflows/prefactor_target/gsmcal.cwl
@@ -311,8 +311,6 @@ steps:
         source: avg_timeresolution_concat
       - id: avg_freqresolution_concat
         source: avg_freqresolution_concat
-      - id: min_unflagged_fraction
-        source: min_unflagged_fraction
     out:
       - id: msout
       - id: flagged_fraction_dict