diff --git a/.gitattributes b/.gitattributes
index ea398e3c4211f53e4acd7f6a5126f9d8a305b190..3d8d037d98dcf534f6b9b039b954f82425c15ac6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -472,6 +472,7 @@ MAC/Config/Apc/d1.apc -text svneol=native#application/octet-stream
 MAC/Config/Apc/e1.apc -text svneol=native#application/octet-stream
 MAC/Deployment/data/OTDB/createPICfile -text
 MAC/Deployment/data/OTDB/loadPICtree -text
+MAC/Deployment/data/PVSS/Observation.dpdef -text
 MAC/Deployment/data/PVSS/PVSSbase.dpdef -text
 MAC/Deployment/data/PVSS/StnObservation.dpdef -text
 MAC/Deployment/data/PVSS/TBBCtrl.dpdef -text
diff --git a/MAC/Deployment/data/PVSS/HardwareMonitor.dpdef b/MAC/Deployment/data/PVSS/HardwareMonitor.dpdef
index ee140f38403281796b357ed20629252b80bd1cec..ff6dc093d3911d24d755f5c9ea9a50ccfec92c49 100644
--- a/MAC/Deployment/data/PVSS/HardwareMonitor.dpdef
+++ b/MAC/Deployment/data/PVSS/HardwareMonitor.dpdef
@@ -1,7 +1,5 @@
 # HardwareMonitor
 #
 RSP.connected		bool
-RSP.process			:ProcessStatus
 
 TBB.connected		bool
-TBB.process			:ProcessStatus
diff --git a/MAC/Deployment/data/PVSS/MACScheduler.dpdef b/MAC/Deployment/data/PVSS/MACScheduler.dpdef
index 93241440ab996a7e58aac5f9cd8e8eac183a18c3..aeea900039a488a0ca9098ea73c955450c03df1b 100644
--- a/MAC/Deployment/data/PVSS/MACScheduler.dpdef
+++ b/MAC/Deployment/data/PVSS/MACScheduler.dpdef
@@ -1,4 +1,6 @@
+plannedObservations	stringArr
 activeObservations	stringArr
+finishedObservations	stringArr
 OTDB.connected		bool
 OTDB.lastPoll		string
 OTDB.pollinterval	int
diff --git a/MAC/Deployment/data/PVSS/ObsCtrl.dpdef b/MAC/Deployment/data/PVSS/Observation.dpdef
similarity index 96%
rename from MAC/Deployment/data/PVSS/ObsCtrl.dpdef
rename to MAC/Deployment/data/PVSS/Observation.dpdef
index e727794ba14e44ad5a865ed52f640f4a24add1ca..2795b48dfa5a5621873c88c71c0db4cb33c58bc1 100644
--- a/MAC/Deployment/data/PVSS/ObsCtrl.dpdef
+++ b/MAC/Deployment/data/PVSS/Observation.dpdef
@@ -1,4 +1,6 @@
 #ObservationControl.dpdef
+claim				:Claim
+
 claimPeriod			int
 preparePeriod		int
 startTime			string
diff --git a/MAC/Deployment/data/PVSS/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
index 4e1fd73288ce2b77c383eaa74bb4de53c6957dcf..f0cf7a3cacf7ea148658dc3d68024dcebc045975 100644
--- a/MAC/Deployment/data/PVSS/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
@@ -10,69 +10,69 @@
 # P/O		Permanent / Observation-based datapoint
 # Datapoint	Name of datapoint or placeholder for multiple points.
 #
-# DPtype	 	Prefix    		C/S 	P/O	DataPoint
+# 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
-Daemons			-			C	P	LOFAR_PermSW_Daemons
-LogProcessor	-			C	P	LOFAR_PermSW_Daemons_LogProcessor
-KVLogger		-			C	P	LOFAR_PermSW_Daemons_KVLogger
-ServiceBroker	- 			C	P	LOFAR_PermSW_Daemons_ServiceBroker
-CTStartDaemon	-			C	P	LOFAR_PermSW_Daemons_CTStartDaemon
-SASGateway		-			C	P	LOFAR_PermSW_Daemons_SASGateway
-MACScheduler	MS			C	P	LOFAR_PermSW_MACScheduler
-Ring			-			C	P	LOFAR_PermSW_@ring@
-Station			-			C	P	LOFAR_PermSW_@ring@_@station@
-Cluster			-			C	P	LOFAR_PermSW_@cluster@
-Node			-			C	P	LOFAR_PermSW_@cluster@_@node@
-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
-Correlator		COR			C	O	LOFAR_ObsSW_@observation@_OnlineCtrl_Correlator
-StorageAppl		STRAPPL		C	O	LOFAR_ObsSW_@observation@_OnlineCtrl_StorageAppl
+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
+Daemons				-			C	P	LOFAR_PermSW_Daemons
+LogProcessor		-			C	P	LOFAR_PermSW_Daemons_LogProcessor
+ServiceBroker		- 			C	P	LOFAR_PermSW_Daemons_ServiceBroker
+CTStartDaemon		-			C	P	LOFAR_PermSW_Daemons_CTStartDaemon
+SASGateway			-			C	P	LOFAR_PermSW_Daemons_SASGateway
+KVLogger			-			C	P	LOFAR_PermSW_Daemons_KVLogger
+SoftwareMonitor		-			C	P	LOFAR_PermSW_SoftwareMonitor
+MACScheduler		MS			C	P	LOFAR_PermSW_MACScheduler
+Ring				-			C	P	LOFAR_PermSW_@ring@
+Station				-			C	P	LOFAR_PermSW_@ring@_@station@
+Cluster				-			C	P	LOFAR_PermSW_@cluster@
+Node				-			C	P	LOFAR_PermSW_@cluster@_@node@
+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
+Correlator			COR			C	O	LOFAR_ObsSW_@observation@_OnlineCtrl_Correlator
+StorageAppl			STRAPPL		C	O	LOFAR_ObsSW_@observation@_OnlineCtrl_StorageAppl
 #OfflineCtrl		OFFLCTRL	C	O	LOFAR_ObsSW_@observation@_OfflineCtrl
 #CImager			CIMG		C	O	LOFAR_ObsSW_@observation@_OfflineCtrl_CImager
-Ring			-			C	O	LOFAR_ObsSW_@observation@_@ring@
-Station			-			C	O	LOFAR_ObsSW_@observation@_@ring@_@station@
+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			CAB			S	P	LOFAR_PIC_@cabinet@
-SubRack			SRCK		S	P	LOFAR_PIC_@cabinet@_@subrack@
-RSPBoard		RSP			S	P	LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@
-RCU				RCU			S	P	LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@_@rcu@
-TBBoard			TBB			S	P	LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@
-StationClock	SCK			S	P	LOFAR_PIC_StationClock
-StnPermSW		-			S	P	LOFAR_PermSW
-Daemons			-			S	P	LOFAR_PermSW_Daemons
-LogProcessor	LGP			S	P	LOFAR_PermSW_Daemons_LogProcessor
-KVLogger		KVL			S	P	LOFAR_PermSW_Daemons_KVLogger
-ServiceBroker	- 			S	P	LOFAR_PermSW_Daemons_ServiceBroker
-CTStartDaemon	-			S	P	LOFAR_PermSW_Daemons_CTStartDaemon
-SASGateway		SGW			S	P	LOFAR_PermSW_Daemons_SASGateway
-DigBoardCtrl	DBC			S	P	LOFAR_PermSW_DigBoardCtrl
-RSPDriver		-			S	P	LOFAR_PermSW_RSPDriver
-TBBDriver		-			S	P	LOFAR_PermSW_TBBDriver
-AMCServer		-			S	P	LOFAR_PermSW_AMCServer
-BeamServer		-			S	P	LOFAR_PermSW_BeamServer
-CalServer		-			S	P	LOFAR_PermSW_CalServer
-StationCtrl		SC			S	P	LOFAR_PermSW_StationCtrl
-TempCtrl		TC			S	P	LOFAR_PermSW_TempCtrl
-HardwareMonitor	HWM			S	P	LOFAR_PermSW_HardwareMonitor
-SoftwareMonitor	SWM			S	P	LOFAR_PermSW_SoftwareMonitor
-MACInfoServer	MIS			S	P	LOFAR_PermSW_MACInfoServer
-StnObsSW		-			S	P	LOFAR_ObsSW
-StnObservation	OBS			S	O	LOFAR_ObsSW_@observation@
-BeamCtrl		BC			S	O	LOFAR_ObsSW_@observation@_BeamCtrl
-CalCtrl			CC			S	O	LOFAR_ObsSW_@observation@_CalCtrl
-TBBCtrl			TBC			S	O	LOFAR_ObsSW_@observation@_TBBCtrl
+StnLOFAR			-			S	P	LOFAR
+StnPIC				-			S	P	LOFAR_PIC
+Cabinet				CAB			S	P	LOFAR_PIC_@cabinet@
+SubRack				SRCK		S	P	LOFAR_PIC_@cabinet@_@subrack@
+RSPBoard			RSP			S	P	LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@
+RCU					RCU			S	P	LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@_@rcu@
+TBBoard				TBB			S	P	LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@
+StationClock		SCK			S	P	LOFAR_PIC_StationClock
+StnPermSW			-			S	P	LOFAR_PermSW
+Daemons				-			S	P	LOFAR_PermSW_Daemons
+LogProcessor		LGP			S	P	LOFAR_PermSW_Daemons_LogProcessor
+ServiceBroker		- 			S	P	LOFAR_PermSW_Daemons_ServiceBroker
+CTStartDaemon		-			S	P	LOFAR_PermSW_Daemons_CTStartDaemon
+SASGateway			SGW			S	P	LOFAR_PermSW_Daemons_SASGateway
+RSPDriver			-			S	P	LOFAR_PermSW_RSPDriver
+TBBDriver			-			S	P	LOFAR_PermSW_TBBDriver
+AMCServer			-			S	P	LOFAR_PermSW_AMCServer
+BeamServer			-			S	P	LOFAR_PermSW_BeamServer
+CalServer			-			S	P	LOFAR_PermSW_CalServer
+HardwareMonitor		HWM			S	P	LOFAR_PermSW_HardwareMonitor
+SoftwareMonitor		SWM			S	P	LOFAR_PermSW_SoftwareMonitor
+TemperatureMonitor	TPM			S	P	LOFAR_PermSW_TemperatureMonitor
+MACInfoServer		MIS			S	P	LOFAR_PermSW_MACInfoServer
+StationCtrl			SC			S	P	LOFAR_PermSW_StationCtrl
+DigBoardCtrl		DBC			S	P	LOFAR_PermSW_DigBoardCtrl
+StnObsSW			-			S	P	LOFAR_ObsSW
+StnObservation		OBS			S	O	LOFAR_ObsSW_@observation@
+BeamCtrl			BC			S	O	LOFAR_ObsSW_@observation@_BeamCtrl
+CalCtrl				CC			S	O	LOFAR_ObsSW_@observation@_CalCtrl
+TBBCtrl				TBC			S	O	LOFAR_ObsSW_@observation@_TBBCtrl
 
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 777edfce6fa21f34a254f0520de7235bad6352e3..4e4d76b8002a10556db2b528d5ce85b44af602ec 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -680,6 +680,8 @@ create_cpp_headerfile()
 {
 	# write out the fields of the components
 	(
+		echo "#ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H"
+		echo "#define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H"
 		echo "// process"
 		expand_component ProcessStatus "FSM" "process" 
 		echo "// object"
@@ -689,9 +691,9 @@ create_cpp_headerfile()
 
 	cleanlist $1 | while read dpt prefix dbtype dptype dp
 	do
-		if [ "${dbtype}" != "$2" -o "${dptype}" != "$3" ]; then
-			continue
-		fi
+#		if [ "${dbtype}" != "$2" -o "${dptype}" != "$3" ]; then
+#			continue
+#		fi
 
 		if [ $prefix != "-" ]; then
 			label=`labelize ${dpt}`
@@ -712,6 +714,8 @@ create_cpp_headerfile()
 			echo ""
 		fi
 	done >>${DESTDIR}/${CPP_HEADERFILE}
+
+	echo "#endif"  >>${DESTDIR}/${CPP_HEADERFILE}
 }
 
 #------------------------------ MAIN program ------------------------------
@@ -772,7 +776,7 @@ ERRORFILE=/tmp/Crea.Error
 INPUTFILE=./PVSSDataPoints.base
 
 # define the output files
-CPP_HEADERFILE=${DBTYPENAME}${DPTYPENAME}DatapointDefs.h
+CPP_HEADERFILE=PVSSDatapointDefs.h
 DP_FILE=${DBTYPENAME}${DPTYPENAME}Datapoints.dpl
 DPT_FILE=${DBTYPENAME}Datapointtypes.dpl