diff --git a/MAC/Deployment/data/PVSS/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
index 941b5ffd072e52990d490a9b6ba894ffa37e9c05..a0a333724af5187065f9194d729ae7ff2df9e02c 100644
--- a/MAC/Deployment/data/PVSS/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
@@ -18,8 +18,9 @@ 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@
-Switch			-		C	P	LOFAR_PIC_@wan@_@switch@
+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@
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 40985f5b7ed105ea19638fc6dbd5195368986e93..f75adaab3d4ac07a3be3af405a7c9048aa46d3d9 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -653,6 +653,7 @@ ARMLIST=`concatfile $ARMFILE`
 CLUSTERLIST=`concatfile $CLUSTERFILE`
 RINGLIST=`concatfile $RINGFILE`
 RINGSTATIONLIST=`create_ring_station_list`
+WANLIST=`concatfile $WANFILE`
 WANSWITCHLIST=`create_wan_switch_list`
 NRRSPBOARDS=`grep -s ${STNNAME} ${BOARDFILE} | awk '{ print $2 }'`