diff --git a/.gitattributes b/.gitattributes
index ed27d0966d36c5536bb656169a4bbe34e59a4157..fb7921dabc8fec880496129db5f40ef44c63b310 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1769,8 +1769,11 @@ MAC/Deployment/data/License/shield.UK608C.txt -text
MAC/Deployment/data/License/shield_developdongles.txt -text
MAC/Deployment/data/License/test_shield.txt -text
MAC/Deployment/data/OTDB/AntennaFieldNames.list -text
+MAC/Deployment/data/OTDB/BDSM.comp -text
MAC/Deployment/data/OTDB/DataProducts.base -text
MAC/Deployment/data/OTDB/Dataslots.base -text
+MAC/Deployment/data/OTDB/GSM.comp -text
+MAC/Deployment/data/OTDB/Imaging.comp -text
MAC/Deployment/data/OTDB/InputDataProductNode.base -text
MAC/Deployment/data/OTDB/InputDataProductNode.list -text
MAC/Deployment/data/OTDB/OutputDataProductNode.base -text
diff --git a/MAC/Deployment/data/OTDB/BBS.comp b/MAC/Deployment/data/OTDB/BBS.comp
index 5f70d6441df42738afb285797d1d69ec41eea48f..f2b4fe2e1854c569f6da1eab85ab609716f07463 100644
--- a/MAC/Deployment/data/OTDB/BBS.comp
+++ b/MAC/Deployment/data/OTDB/BBS.comp
@@ -258,6 +258,9 @@ par Operation I text - 10 0 '' -
#--------------------------------------------------------------------------------------------------------
node Step 4.0.0 development 'node constraint' 'BBS Step Container'
uses DefaultBBSStep 4.0.0 development 1 'BBS Template Step'
+# name dir. type unit prun. vm value constr. descr.
+#--------------------------------------------------------------------------------------------------------
+par nrOfDefaultBBSStep I uint - 10 0 0 - 'Number of DefaultBBSSteps'
# -- BBS
#
diff --git a/MAC/Deployment/data/OTDB/BDSM.comp b/MAC/Deployment/data/OTDB/BDSM.comp
new file mode 100644
index 0000000000000000000000000000000000000000..6c335e4567180dcce3298090b9e7d87a8d3391a6
--- /dev/null
+++ b/MAC/Deployment/data/OTDB/BDSM.comp
@@ -0,0 +1,56 @@
+# -- BDSM --
+#
+# Component description of BDSM settings
+#
+# $Id$
+#
+# name name of the node
+# version version of this node specification
+# quality stable | test | development
+# constraint python script to check multiparameter constrains
+# may return OK, NotOK, Unknown
+# description What this module does.
+#
+# Note 1: to seperate the parameterlines from the Node lines each node line
+# begins with the label 'Node'.
+# Note 2: To define dependancies between nodes the label 'Uses' is used.
+# A + sign may be added to the versionnr to indicate that the given
+# versionnr is the minimal version the module should have. (NOT YET IMPLEMENTED)
+#
+
+#########################################################################################################
+# name vers qual constr. descr.
+#--------------------------------------------------------------------------------------------------------
+node BDSM 4.0.0 development 'node constraint' "BDSM"
+
+#
+# name name of the parameter
+# direction I: input only; O: changes will be logged during runtime; IO: both
+# type parametertype: should exist in param_type table of OTDB (= ParamTypeConv)
+# unit name of unit of parameter (should exist in unit table (= UnitConv)
+# pruninglevel when parameter values are thrown away from the database. (NOT YET USED)
+# validationMoment moment the parameter values is validated (NOT YET USED)
+# value value(range) of the parameter.
+# constraint script to run to check its value
+# description what the parameter manages.
+#--------------------------------------------------------------------------------------------------------
+# name dir. type unit prun. vm value constr. descr.
+#--------------------------------------------------------------------------------------------------------
+par advanced_opts I pbool - 10 100 'true|false;false' - ''
+par atrous_do I pbool - 10 100 'true|false;false' - ''
+par flagging_opts I pbool - 10 100 'true|false;false' - ''
+par interactive I pbool - 10 100 'true|false;false' - ''
+par mean_map I text - 10 100 "default" - ''
+par multichan_opts I pbool - 10 100 'true|false;false' - ''
+par output_opts I pbool - 10 100 'true|false;false' - ''
+par polarisation_do I pbool - 10 100 'true|false;false' - ''
+par psf_vary_do I pbool - 10 100 'true|false;false' - ''
+par rms_box I text - 10 100 '(15.0,9.0)' - ''
+par rms_map I pbool - 10 100 'true|false;true ' - ''
+par shapelet_do I pbool - 10 100 'true|false;false' - ''
+par spectralindex_do I pbool - 10 100 'true|false;false' - ''
+par tresh I ptext - 10 100 'hard|none;hard' - ''
+par tresh_isl I dbl - 10 100 3.0 - ''
+par tresh_pix I dbl - 10 100 5.0 - ''
+par quiet I pbool - 10 100 'true|false;false' - ''
+par clobber I pbool - 10 100 'true|false;true' - ''
diff --git a/MAC/Deployment/data/OTDB/GSM.comp b/MAC/Deployment/data/OTDB/GSM.comp
new file mode 100644
index 0000000000000000000000000000000000000000..2656176eedd45b71bf7e2864d5f4f52408d03de0
--- /dev/null
+++ b/MAC/Deployment/data/OTDB/GSM.comp
@@ -0,0 +1,47 @@
+# -- GSM --
+#
+# Component description of GSM settings
+#
+# $Id$
+#
+# name name of the node
+# version version of this node specification
+# quality stable | test | development
+# constraint python script to check multiparameter constrains
+# may return OK, NotOK, Unknown
+# description What this module does.
+#
+# Note 1: to seperate the parameterlines from the Node lines each node line
+# begins with the label 'Node'.
+# Note 2: To define dependancies between nodes the label 'Uses' is used.
+# A + sign may be added to the versionnr to indicate that the given
+# versionnr is the minimal version the module should have. (NOT YET IMPLEMENTED)
+#
+
+#########################################################################################################
+# name vers qual constr. descr.
+#--------------------------------------------------------------------------------------------------------
+node GSM 4.0.0 development 'node constraint' "GSM"
+
+#
+# name name of the parameter
+# direction I: input only; O: changes will be logged during runtime; IO: both
+# type parametertype: should exist in param_type table of OTDB (= ParamTypeConv)
+# unit name of unit of parameter (should exist in unit table (= UnitConv)
+# pruninglevel when parameter values are thrown away from the database. (NOT YET USED)
+# validationMoment moment the parameter values is validated (NOT YET USED)
+# value value(range) of the parameter.
+# constraint script to run to check its value
+# description what the parameter manages.
+#--------------------------------------------------------------------------------------------------------
+# name dir. type unit prun. vm value constr. descr.
+#--------------------------------------------------------------------------------------------------------
+par monetdb_hostname I text - 10 100 "lbd002" - ''
+par monetdb_port I int - 10 100 51000 - ''
+par monetdb_name I text - 10 100 "gsm" - ''
+par monetdb_user I text - 10 100 "gsm" - ''
+par monetdb_password I text - 10 100 "msss" - ''
+par assoc_theta I text - 10 100 "" - ''
+par sourcedb_target_path I text - 10 100 "" - ''
+par parmdb_suffix I text - 10 100 ".parmdbm" - ''
+
diff --git a/MAC/Deployment/data/OTDB/Imager.comp b/MAC/Deployment/data/OTDB/Imager.comp
deleted file mode 100644
index 383b06b762c3b8680145adf384336198650f1969..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/OTDB/Imager.comp
+++ /dev/null
@@ -1,72 +0,0 @@
-# -- Images--
-#
-# $Id$
-#
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-node Images 4.0.0 development 'node constraint' "Image settings for Imager"
-
-
-# name dir. type unit prun. vm value constr. descr.
-#-------------------------------------------------------------------------------------------------------
-par stokes I vtext - 10 0 '["I","Q","U","V"]' - "stokes to be included"
-par shape I vint - 10 0 '[2048,2048]' - "???"
-par cellSize I vint - 10 0 '[200,200]' - "cellsize in arc seconds"
-par frequency I vint - 10 0 '[37987899,38183212]' - "frequency"
-par nchan I int - 10 0 1 - "number of channels"
-par angle1 I vdbl - 10 0 '>>Beam.angle1' - 'direction angle1'
-par angle2 I vdbl - 10 0 '>>Beam.angle2' - 'direction angle2'
-par directionType I text - 10 0 '>>Beam.directionType' - 'direction type'
-
-
-# -- Solver --
-#
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-node Solver 4.0.0 development 'node constraint' "???"
-
-# name dir. type unit prun. vm value constr. descr.
-#--------------------------------------------------------------------------------------------------------
-par type I text - 10 0 'Dirty' - 'type of clean'
-par algorithm I text - 10 0 'MultiScale' - '???'
-par niter I int - 10 0 50 - '???'
-par gain I dbl - 10 0 0.1 - '???'
-par verbose I bool - 10 0 T - '???'
-par scales I vint - 10 0 '[0,3]' - '???'
-
-
-# -- Gridder
-#
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-node Gridder 4.0.0 development 'node constraint' "Gridder settings for Imager"
-
-# name dir. type unit prun. vm value constr. descr.
-#--------------------------------------------------------------------------------------------------------
-par type I ptext - 10 0 'SphFunc|WStack|WProject;WProject' - '???'
-par wmax I int - 10 0 150 - '???'
-par nwplanes I int - 10 0 257 - '???'
-par oversample I int - 10 0 1 - '???'
-par cutoff I dbl - 10 0 0.001 - '???'
-par nfacets I int - 10 0 1 - '???'
-
-
-
-# -- Imager --
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-node Imager 4.0.0 development 'node constraint' "Imager"
-
-# name dir. type unit prun. vm value constr. descr.
-#-----------------------------------------------------------------------------------------------------------------------------
-par datacolumn I ptext - 10 0 'CORRECTED_DATA|DATA|MODEL_DATA;CORRECTED_DATA' - '???'
-par minUV I int - 10 0 100 - '???'
-par ncycles I int - 10 0 0 - '???'
-par restore I bool - 10 0 F - '???'
-par restore_beam I vint - 10 0 '[30,30,0]' - 'beam in arcsec,arcsec,degrees'
-
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-uses Gridder 4.0.0 development '1' "Gridder settings"
-uses Images 4.0.0 development '1' "Imager settings"
-uses Solver 4.0.0 development '1' "Solver settings"
diff --git a/MAC/Deployment/data/OTDB/Imaging.comp b/MAC/Deployment/data/OTDB/Imaging.comp
new file mode 100644
index 0000000000000000000000000000000000000000..475724a566169180ac66a0b832b89545c46aa547
--- /dev/null
+++ b/MAC/Deployment/data/OTDB/Imaging.comp
@@ -0,0 +1,40 @@
+# -- Imaging --
+#
+# Component description of Imaging configuration setting
+#
+# $Id$
+#
+# name name of the node
+# version version of this node specification
+# quality stable | test | development
+# constraint python script to check multiparameter constrains
+# may return OK, NotOK, Unknown
+# description What this module does.
+#
+# Note 1: to seperate the parameterlines from the Node lines each node line
+# begins with the label 'Node'.
+# Note 2: To define dependancies between nodes the label 'Uses' is used.
+# A + sign may be added to the versionnr to indicate that the given
+# versionnr is the minimal version the module should have. (NOT YET IMPLEMENTED)
+#
+
+#########################################################################################################
+# name vers qual constr. descr.
+#--------------------------------------------------------------------------------------------------------
+node Imaging 4.0.0 development 'node constraint' "Imaging"
+
+#
+# name name of the parameter
+# direction I: input only; O: changes will be logged during runtime; IO: both
+# type parametertype: should exist in param_type table of OTDB (= ParamTypeConv)
+# unit name of unit of parameter (should exist in unit table (= UnitConv)
+# pruninglevel when parameter values are thrown away from the database. (NOT YET USED)
+# validationMoment moment the parameter values is validated (NOT YET USED)
+# value value(range) of the parameter.
+# constraint script to run to check its value
+# description what the parameter manages.
+#--------------------------------------------------------------------------------------------------------
+# name dir. type unit prun. vm value constr. descr.
+#--------------------------------------------------------------------------------------------------------
+par number_of_major_cycles I uint - 10 0 3 - ''
+
diff --git a/MAC/Deployment/data/OTDB/PythonControl.comp b/MAC/Deployment/data/OTDB/PythonControl.comp
index f095ad16b173e47b14793ea5876b055de48273a7..d696a620eda48990e8a521cf4d237871c3126d2f 100644
--- a/MAC/Deployment/data/OTDB/PythonControl.comp
+++ b/MAC/Deployment/data/OTDB/PythonControl.comp
@@ -15,13 +15,15 @@ par runtimeDirectory I text - 100 0 '/home/pipeline/runtime/${
par resultDirectory I text - 100 0 'lexar001:/data/${MSNUMBER}/output' - "Where to store the results"
par workingDirectory I text - 100 0 '/data/scratch/${MSNUMBER}/work' - "Where to store temporarely files"
par observationDirectory I text - 100 0 '/data/L${OBSID}' - "Subdirectory where the datafiles were stored by the online processes."
-par canCommunicate I bool - 10 0 'true' - "Temp flag to tell MAC if the current PythonController can respond to CONTROL_xxx messages"
+par canCommunicate I bool - 10 0 'true' - "Temp flag to tell MAC if the current PythonController can respond to CONTROL_xxx messages"
+par nrOfBBS I uint - 100 0 0 - "number of BBS instances"
+par nrOfBDSM I uint - 100 0 0 - "number of BDSM instances"
-#uses ApplCtrl 4.0.0 development 1 "The ACC controller"
-#uses Flagger 4.0.0 development 1 "Flagger"
uses DPPP 4.0.0 development 1 "DPcube"
uses BBS 4.0.0 development 1 "Blackboard System"
-uses Imager 4.0.0 development 1 "Imager"
-uses Calibration 4.0.0 development 1 "Calibration"
+uses Imaging 4.0.0 development 1 "Imaging"
+uses GSM 4.0.0 development 1 "GSM"
+uses BDSM 4.0.0 development 1 "BDSM"
+uses Calibration 4.0.0 development 1 "Calibration"