diff --git a/MAC/Deployment/data/PVSS/BeamCtrl.dpdef b/MAC/Deployment/data/PVSS/BeamCtrl.dpdef
index 696b6f8d87a054ee7b2a0db1a0b57e1c5a1663b1..0123960f2524d5e8dee8bb6f481f2f73497c8929 100644
--- a/MAC/Deployment/data/PVSS/BeamCtrl.dpdef
+++ b/MAC/Deployment/data/PVSS/BeamCtrl.dpdef
@@ -1,5 +1,4 @@
 # BeamCntrl
 connected		bool
-
-	
+beams			stringArr
 	
diff --git a/MAC/Deployment/data/PVSS/CalCtrl.dpdef b/MAC/Deployment/data/PVSS/CalCtrl.dpdef
new file mode 100644
index 0000000000000000000000000000000000000000..352b16d81156bb773b52bc5cb4612b2dcd4e6ab9
--- /dev/null
+++ b/MAC/Deployment/data/PVSS/CalCtrl.dpdef
@@ -0,0 +1,4 @@
+# CalCtlr
+#
+connected	bool
+subarrays	stringArr
diff --git a/MAC/Deployment/data/PVSS/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
index 3bd8192fad69b1d8e9203e57afb8ef299b94977e..39a23be3d5c1a09408414a12b3728e7b28455abf 100644
--- a/MAC/Deployment/data/PVSS/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
@@ -12,38 +12,38 @@
 #
 # DPtype	 Prefix    C/S P/O	DataPoint
 #----------------------------------------------------------------------------
-LOFAR			-		C	P	LOFAR
-PIC				-		C	P	LOFAR_PIC
-Ring			-		C	P	LOFAR_PIC_@ring@
-Station			STS		C	P	LOFAR_PIC_@ring@_@station@
-Cluster			-		C	P	LOFAR_PIC_@cluster@
-Node			-		C	P	LOFAR_PIC_@cluster@_@node@
-WAN				-		C	P	LOFAR_PIC_WAN
-WANarea			-		C	P	LOFAR_PIC_WAN_@wan@
-Switch			-		C	P	LOFAR_PIC_WAN_@wan@_@switch@
-PermSW			-		C	P	LOFAR_PermSW
-MACScheduler	MS		C	P	LOFAR_PermSW_MACScheduler
-Ring			-		C	P	LOFAR_PermSW_@ring@
-Station			-		C	P	LOFAR_PermSW_@ring@_@station@
-ObsSW			-		C	O	LOFAR_ObsSW
-Observation		-		C	O	LOFAR_ObsSW_@observation@
-ObsCtrl			OBS		C	O	LOFAR_ObsSW_@observation@_ObsCtrl
-OnlineCtrl		ON		C	O	LOFAR_ObsSW_@observation@_OnlineCtrl
-OfflineCtrl		OFF		C	O	LOFAR_ObsSW_@observation@_OfflineCtrl
-Ring			-		C	O	LOFAR_ObsSW_@observation@_@ring@
-Station			-		C	O	LOFAR_ObsSW_@observation@_@ring@_@station@
+LOFAR			-			C	P	LOFAR
+PIC				-			C	P	LOFAR_PIC
+Ring			-			C	P	LOFAR_PIC_@ring@
+Station			STS			C	P	LOFAR_PIC_@ring@_@station@
+Cluster			-			C	P	LOFAR_PIC_@cluster@
+Node			-			C	P	LOFAR_PIC_@cluster@_@node@
+WAN				-			C	P	LOFAR_PIC_WAN
+WANarea			-			C	P	LOFAR_PIC_WAN_@wan@
+Switch			-			C	P	LOFAR_PIC_WAN_@wan@_@switch@
+PermSW			-			C	P	LOFAR_PermSW
+MACScheduler	MS			C	P	LOFAR_PermSW_MACScheduler
+Ring			-			C	P	LOFAR_PermSW_@ring@
+Station			-			C	P	LOFAR_PermSW_@ring@_@station@
+ObsSW			-			C	P	LOFAR_ObsSW
+Observation		OBS			C	O	LOFAR_ObsSW_@observation@
+ObsCtrl			OBSCTRL		C	O	LOFAR_ObsSW_@observation@_ObsCtrl
+OnlineCtrl		ONLCTRL		C	O	LOFAR_ObsSW_@observation@_OnlineCtrl
+OfflineCtrl		OFFLCTRL	C	O	LOFAR_ObsSW_@observation@_OfflineCtrl
+Ring			-			C	O	LOFAR_ObsSW_@observation@_@ring@
+Station			-			C	O	LOFAR_ObsSW_@observation@_@ring@_@station@
 #
-StnLOFAR		-		S	P	LOFAR
-StnPIC			-		S	P	LOFAR_PIC
-Cabinet			-		S	P	LOFAR_PIC_@cabinet@
-SubRack			-		S	P	LOFAR_PIC_@cabinet@_@subrack@
-RSPBoard		RSP		S	P	LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@
-StationClock	SCK		S	P	LOFAR_PIC_StationClock
-StnPermSW		-		S	P	LOFAR_PermSW
-CalCtrl			CC		S	P	LOFAR_PermSW_CalCtrl@instance@
-DigBoardCtrl	DBC		S	P	LOFAR_PermSW_DigBoardCtrl@instance@
-StationCtrl		SC		S	P	LOFAR_PermSW_StationCtrl
-ObsSW			-		S	O	LOFAR_ObsSW
-Observation		-		S	O	LOFAR_ObsSW_@observation@
-BeamCtrl		BC		S	O	LOFAR_ObsSW_@observation@_BeamCtrl
+StnLOFAR		-			S	P	LOFAR
+StnPIC			-			S	P	LOFAR_PIC
+Cabinet			-			S	P	LOFAR_PIC_@cabinet@
+SubRack			-			S	P	LOFAR_PIC_@cabinet@_@subrack@
+RSPBoard		RSP			S	P	LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@
+StationClock	SCK			S	P	LOFAR_PIC_StationClock
+StnPermSW		-			S	P	LOFAR_PermSW
+DigBoardCtrl	DBC			S	P	LOFAR_PermSW_DigBoardCtrl
+StationCtrl		SC			S	P	LOFAR_PermSW_StationCtrl
+StnObsSW		-			S	P	LOFAR_ObsSW
+Observation		OBS			S	O	LOFAR_ObsSW_@observation@
+BeamCtrl		BC			S	O	LOFAR_ObsSW_@observation@_BeamCtrl
+CalCtrl			CC			S	O	LOFAR_ObsSW_@observation@_CalCtrl
 
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index e0f6635ff95a4e1e5dda6a45516c627341e3599e..af6f52f392c722f3e335c8b30b74ed86e258ca24 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -436,7 +436,7 @@ number_dps()
 }
 
 #
-# create_dpt_file inputfile dbtype dptype
+# create_dpt_file inputfile dbtype
 #
 create_dpt_file()
 {
@@ -447,11 +447,17 @@ create_dpt_file()
 		echo	""
 	) >${DESTDIR}/${DPT_FILE}
 
-	cleanlist $1 | while read dpt prefix dbtype dptype dp
+	prevdpt="abc"
+	cleanlist $1 | sort | while read dpt prefix dbtype dptype dp
 	do
-		if [ "${dbtype}" != "$2" -o "${dptype}" != "$3" ]; then
+		if [ "${dbtype}" != "$2" ]; then
+			continue
+		fi
+
+		if [ "${prevdpt}" == "${dpt}" ]; then
 			continue
 		fi
+		prevdpt=${dpt}
 
 		if [ ! -f ${dpt}.dpdef ]; then
 			echo "TypeName"
@@ -651,7 +657,7 @@ INPUTFILE=./PVSSDataPoints.base
 # define the output files
 CPP_HEADERFILE=${DBTYPENAME}${DPTYPENAME}DatapointDefs.h
 DP_FILE=${DBTYPENAME}${DPTYPENAME}Datapoints.dpl
-DPT_FILE=${DBTYPENAME}${DPTYPENAME}Datapointtypes.dpl
+DPT_FILE=${DBTYPENAME}Datapointtypes.dpl
 
 # construct some lists
 ARMLIST=`concatfile $ARMFILE`
@@ -663,7 +669,7 @@ WANSWITCHLIST=`create_wan_switch_list`
 NRRSPBOARDS=`grep -s ${STNNAME} ${BOARDFILE} | awk '{ print $2 }'`
 
 # create the desired files
-create_dpt_file ${INPUTFILE} ${DBTYPE} ${DPTYPE}
+create_dpt_file ${INPUTFILE} ${DBTYPE} 
 create_dp_file  ${INPUTFILE} ${DBTYPE} ${DPTYPE}
 (
 	echo -n "// This file was generated by $(basename $0) ${VERSION} on " ; date