diff --git a/MAC/Deployment/data/OTDB/DPPP.comp b/MAC/Deployment/data/OTDB/DPPP.comp
index f291baec1ee24624d88c5a3bd53bea1f26ec7c8d..bcf17c2c757263dd1f5462dd50873aa0a1b0ad6c 100644
--- a/MAC/Deployment/data/OTDB/DPPP.comp
+++ b/MAC/Deployment/data/OTDB/DPPP.comp
@@ -9,6 +9,10 @@
 
 #    name                    dir. type   unit   prun. vm   value                         constr.  descr.
 #--------------------------------------------------------------------------------------------------------
+node   count        	 4.0.0  development 'node constraint'  "Count parameters"
+par	path	                I	    text	-	10		0	"-"			-	"Directory where to create the flag percentages tables"
+par	save	                I	    bool	-	10		0	FALSE		-	"Save flag percentages per frequency and baseline?"
+
 node   msin        	 4.0.0  development 'node constraint'  "Input MeasurementSet"
 par	autoweight	I		bool	-	10		0	FALSE	-		"Calculate weights from auto-correlations?"
 par	band		I		int	-	10		0	-1		-		"Band (spectral window) to use; -1 is no selection"
@@ -44,8 +48,7 @@ par	flagdata I                  bool -	10	        0      F	        -	"Force NDPP
 
 node   preflagger    	 4.0.0  development 'node constraint'  "Preflagger"
 par	type		I		text	-	10		0	"preflagger"	-	"Type of the flagger, do not change"
-par	count.path	I	text	-	10		0	"-"			-	"Directory where to create the flag percentages tables"
-par	count.save	I	bool	-	10		0	F			-	"Save flag percentages per frequency and baseline?"
+uses    count        	4.0.0	development 1	"Count parameters"
 par	expr		I		vtext	-	10		0	'[]'				-	"Expression of preflagger keyword sets. eg:  [c1 and (c2 or c3)]"
 par	timeofday	I		vtext	-	10		0	'[]'				-	"12:34:56.789, 12h34m56.789, or a value followed by a unit like h, min, or s."
 par	abstime		I		vtext	-	10		0	'[]'				-	"12-Mar-2010/11:31:00.000"
@@ -74,8 +77,7 @@ par	imagmax		I		vflt	-	10		0	'[1e30]'			-	"Maximum imaginary complex part per co
 node   aoflagger    	 4.0.0  development 'node constraint'  "AOflagger"
 par	type		I		text	-	10		0	"aoflagger"	-	"Type of the flagger, do not change"
 par	autocorr	I		bool	-	10		0	F			-	"Use autocorrelations?"
-par	count.path	I	text	-	10		0	""			-	"Directory where to create the flag percentages tables"
-par	count.save	I	bool	-	10		0	F			-	"Save flag percentages per frequency and baseline?"
+uses    count        	4.0.0	development 1	"Count parameters"
 par	keepstatistics	I	bool	-	10		0      T			-	"Write quality statistics subtables?"
 par	memorymax	I	flt	-	10		0	0			-	"Maximum amount of memory (GB) to use for time window; 0 = no maximum"
 par	memoryperc	I	flt	-	10		0	0			-	"Percentage of memory to use for time window"
@@ -87,8 +89,7 @@ par	timewindow	I	flt	-	10		0	0			-	"Number of time slots to be flagged jointly.
 
 node   madflagger    	 4.0.0  development 'node constraint'  "MADflagger"
 par	type		I		text	-	10		0	"madflagger"	-	"Type of the flagger, do not change"
-par	count.path	I	text	-	10		0	"-"			-	"Directory where to create the flag percentages tables"
-par	count.save	I	bool	-	10		0	F			-	"Save flag percentages per frequency and baseline?"
+uses    count        	4.0.0	development 1	"Count parameters"
 par	threshold	I		flt	-	10		0	1				-	"The flagging threshold"
 par	freqwindow	I		int	-	10		0	1				-	"Number of channels in the median box. If not odd, 1 is subtracted."
 par	timewindow	I		int	-	10		0	1				- 	"Number of times in the median box. If not odd, 1 is subtracted."
@@ -110,8 +111,7 @@ par	minperc		I		flt	-	10		0	0.0				-	"Like minpoints, but expressed as a percent
 
 node	uvwflagger	4.0.0	development	'node constraint'	"UVW flagger"
 par	type		I		text	-	10		0	"uvwflagger"	-	"Type of the flagger, do not change"
-par	count.path	I	text	-	10		0	"-"			-	"Directory where to create the flag percentages tables"
-par	count.save	I	bool	-	10		0	F			-	"Save flag percentages per frequency and baseline?"
+uses    count        	4.0.0	development 1	"Count parameters"
 par	uvmrange	I		vtext	-	10		0	'[]'				-	"Flag baselines with UV within one the given ranges (in meters)."
 par	uvmmin		I		dbl	-	10		0	0.0				-	"Flag baselines with UV < uvmmin meter."
 par	uvmmax		I		dbl	-	10		0	1e15			-	"Flag baselines with UV > uvmmax meter."
diff --git a/MAC/Deployment/data/OTDB/awimager.comp b/MAC/Deployment/data/OTDB/awimager.comp
index e875dcf7bd7d47b80450c79c7915606aa0557534..dcf7d0bd261932a942dcc4659d1573098c565a68 100644
--- a/MAC/Deployment/data/OTDB/awimager.comp
+++ b/MAC/Deployment/data/OTDB/awimager.comp
@@ -9,9 +9,9 @@
 
 #    name                    dir. type   unit   prun. vm   value                         constr.  descr.
 #--------------------------------------------------------------------------------------------------------
-node   msin        	 4.0.0  development 'node constraint'  "Input MeasurementSet"
-par	autoweight	I		bool	-	10		0	FALSE	-		"Calculate weights from auto-correlations?"
+node AWimager 4.0.0  development 'node constraint'  "awimager parameters"
 
+par	autoweight	I		bool	-	10		0	FALSE	-		"Calculate weights from auto-correlations?"
 par PBCut I flt - 10 0 1e-2 - "Level below which the dirty images will be set to zero. Expressed in units of peak primary beam."
 par PsfImage I text - 10 0 "" - "Input PSF image for the cleaning"
 par RefFreq I flt Hz 10 0 "" - "Reference Frequency (Hz)"