diff --git a/.gitattributes b/.gitattributes
index 65e8cc953e3a138cdf10f6542507260c3cc4db44..0eac2164c1d7ca7de1f42f774df2ffb89f25a1c6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5285,7 +5285,10 @@ SAS/XML_generator/test/test_regression.in_data/txt/lc4_019_1.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/old_Long_Baseline_test.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/old_input.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/old_pulsar_pipe_test.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/prefactor[!!-~]HBA[!!-~]SDF-PPE.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/prefactor[!!-~]LBA[!!-~]SDF-PPE.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/prefactor.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/prefactor_LBA.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/test_LB.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/test_dysco.txt -text
 SAS/XML_generator/test/test_regression.in_data/txt/test_input.txt -text
@@ -5306,6 +5309,8 @@ SAS/XML_generator/test/test_regression.in_data/xml/Ticket_6923.xml -text
 SAS/XML_generator/test/test_regression.in_data/xml/hd156279b_reference.xml -text
 SAS/XML_generator/test/test_regression.in_data/xml/input.xml -text
 SAS/XML_generator/test/test_regression.in_data/xml/lc4_019_1.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/prefactor[!!-~]HBA[!!-~]SDF-PPE.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/prefactor[!!-~]LBA[!!-~]SDF-PPE.xml -text
 SAS/XML_generator/test/test_regression.in_data/xml/prefactor.xml -text
 SAS/XML_generator/test/test_regression.in_data/xml/pulsar_pipe_test.xml -text
 SAS/XML_generator/test/test_regression.in_data/xml/test_LB.xml -text
diff --git a/SAS/XML_generator/src/xmlgen.py b/SAS/XML_generator/src/xmlgen.py
index 17a3fd0832ae83b59e66de8db0cb5dcbc363f8ce..c2951a40e2dad7bcd6b4ead77df48986c5bb8513 100755
--- a/SAS/XML_generator/src/xmlgen.py
+++ b/SAS/XML_generator/src/xmlgen.py
@@ -504,6 +504,7 @@ def writeDemixParameters(ofile, demixParameters):
 
 def writeXMLTargetPipeline(ofile, topo, pred_topo, name, descr, defaulttemplate, flagging, duration, demixParameters,
                            bbsParameters, uvintopo, uvinname, instrintopo, instrinname, uvoutname, uvouttopo,
+                           instroutname, instrouttopo, 
                            storageCluster, status, nr_tasks, nr_cores_per_task, miscParameters):
     stor_cluster = dataProductCluster(storageCluster)
     proc_cluster = processingCluster(storageCluster, nr_tasks, nr_cores_per_task)
@@ -526,6 +527,17 @@ def writeXMLTargetPipeline(ofile, topo, pred_topo, name, descr, defaulttemplate,
     ##TODO if bbsParameters: ??
     writeBBSParameters(ofile, bbsParameters)
     writeMiscParameters(ofile, miscParameters)
+    if instroutname and instrouttopo:
+        instr_out = """                        <item>
+                          <lofar:instrumentModelDataProduct>
+                            <name>%s</name>
+                            <topology>%s</topology>
+                            <status>no_data</status>
+                            %s
+                          </lofar:instrumentModelDataProduct>
+                        </item>""" % (instroutname, instrouttopo, stor_cluster)
+    else:
+        instr_out = ""
     print >> ofile, r"""</pipelineAttributes>
                     <usedDataProducts>
                       <item>
@@ -548,9 +560,11 @@ def writeXMLTargetPipeline(ofile, topo, pred_topo, name, descr, defaulttemplate,
                             %s
                           </lofar:uvDataProduct>
                         </item>
+                        %s
                     </resultDataProducts>
                     </lofar:pipeline>
-                  </item>""" % (uvintopo, uvinname, instrintopo, instrinname, uvoutname, uvouttopo, stor_cluster)
+                  </item>""" % (uvintopo, uvinname, instrintopo, instrinname,
+                  uvoutname, uvouttopo, stor_cluster, instr_out)
 
 
 def writeXMLCalPipe(ofile, topo, pred_topo, name, descr, defaulttemplate, flagging, duration, skymodel, demixParameters,
@@ -1949,7 +1963,7 @@ def writeImagingPipeline(ofile, nr_beams, targetBeams, blockTopo, nrRepeats,
         create_pipeline = targetBeams[beamNr][7]
         if create_pipeline:
             imaging_pipe_topology = blockTopo + 'PI' + str(beamNr)  # 1.PI
-            imaging_pipe_output_topology = imaging_pipe_topology + '.dps'  # 1.PI.dps
+            imaging_pipe_output_topology = imaging_pipe_topology + '.sky.dps'  # 1.PI.dps
             imaging_pipe_predecessors_string = ','.join(
                 imaging_pipe_predecessors[beamNr])  # creates nrRepeats long comma separated list
 
@@ -2078,8 +2092,6 @@ def writeRepeat(ofile, projectName, blockTopo, repeatNr, settings, imaging_pipe_
             tar_pipe_predecessor = tar_obs_topology + ',' + cal_pipe_calibrator_topology  # 1.T,1.CPC
             tar_pipe_input_INST_topo = cal_pipe_calibrator_topology + '.inst.dps'  # 1.CPC.inst.dps
     elif processing == 'Prefactor':
-        if settings['calibration_mode'] == "internal":
-            raise GenException('Prefactor mode currently does not support an internal calibration beam.')
         cal_prepipe_default_template = "Preprocessing Pipeline"
         tar_prepipe_default_template = "Preprocessing Pipeline"
         prepipe_calibrator_description = "Preprocessing"
@@ -2087,14 +2099,16 @@ def writeRepeat(ofile, projectName, blockTopo, repeatNr, settings, imaging_pipe_
         prepipe_target_predecessor = tar_obs_topology  # 1.T
         prepipe_calibrator_predecessor = cal_obs_topology  # 1.C
 
-        cal_obs_pipe_default_template = "Calibration Pipeline"
-        cal_tar_pipe_default_template = "Calibration Pipeline"
+        cal_obs_pipe_default_template = "MSSS target pre-processing" #TODO fill in the correct PREFACTOR at some point
+        cal_tar_pipe_default_template = "MSSS target pre-processing" #TODO fill in the correct PREFACTOR at some point
         cal_pipe_calibrator_description = "Cal Pipe Calibrator"
         cal_pipe_target_description = "Cal Pipe Target"
         cal_pipe_predecessor = prepipe_calibrator_topology #1.CPCP
-        tar_pipe_predecessor = prepipe_target_topology + ',' + cal_pipe_calibrator_topology  # 1.CPCT,1.CPC
-        tar_pipe_input_INST_topo = cal_pipe_calibrator_topology + '.inst.dps'  # 1.CPC.inst.dps
-        tar_pipe_output_INST_topo = cal_pipe_target_topology + '.inst.dps'  # 1.CPT.inst.dps
+        if settings['calibration_mode'] == "internal":
+            tar_pipe_input_INST_topo = cal_pipe_target_topology + '.inst.dps'  # 1.P1.dps
+        #    raise GenException('Prefactor mode currently does not support an internal calibration beam.')
+        else:
+            tar_pipe_input_INST_topo = cal_pipe_calibrator_topology + '.inst.dps'  # 1.CPC.inst.dps
 
     bfDataExtension = determineBfDataExtension(coherentStokesData, incoherentStokesData)
 
@@ -2724,6 +2738,7 @@ def writeRepeat(ofile, projectName, blockTopo, repeatNr, settings, imaging_pipe_
                                        tar_pipe_input_INST_topo,
                                        tar_pipe_topologies[beamNr] + ".uv.dps",
                                        tar_pipe_topologies[beamNr] + ".uv.dps",
+                                       "","", # No output instrument model
                                        settings['cluster'],
                                        status,
                                        nr_tasks,
@@ -2812,26 +2827,30 @@ def writeRepeat(ofile, projectName, blockTopo, repeatNr, settings, imaging_pipe_
                                     nr_cores_per_task,
                                     miscParameters)
 
-                writeXMLCalPipe(ofile,
-                                tar_pipe_topologies[beamNr],
-                                tar_pipe_predecessor,
-                                tar_pipe_name,
-                                tar_pipe_description,
-                                tar_pipe_default_template,
-                                settings['flaggingStrategy'],
-                                targetBeams[beamNr][8],
-                                targetBBS[beamNr][0][0],
-                                settings['targetDemix'][beamNr][0],
-                                targetBBS[beamNr][0][1:],
-                                tar_prepipe_topologies[beamNr] + ".uv.dps",
-                                tar_pipe_topologies[beamNr] + ".inst.dps",
-                                tar_pipe_topologies[beamNr] + ".inst.dps",
-                                tar_pipe_topologies[beamNr] + ".uv.dps",
-                                settings['cluster'],
-                                status,
-                                nr_tasks,
-                                nr_cores_per_task,
-                                miscParameters)
+                tar_pipe_predecessor = tar_prepipe_topologies[beamNr] + ',' + cal_pipe_calibrator_topology
+                writeXMLTargetPipeline(ofile,
+                                       tar_pipe_topologies[beamNr],
+                                       tar_pipe_predecessor,
+                                       tar_pipe_name,
+                                       tar_pipe_description,
+                                       tar_pipe_default_template,
+                                       settings['flaggingStrategy'],
+                                       targetBeams[beamNr][8],
+                                       settings['targetDemix'][beamNr][0],
+                                       settings['targetBBS'][beamNr][0][1:],
+                                       tar_prepipe_topologies[beamNr] + ".uv.dps",
+                                       tar_prepipe_topologies[beamNr] + ".uv.dps",
+                                       tar_pipe_input_INST_topo,
+                                       tar_pipe_input_INST_topo,
+                                       tar_pipe_topologies[beamNr] + ".uv.dps",
+                                       tar_pipe_topologies[beamNr] + ".uv.dps",
+                                       tar_pipe_topologies[beamNr] + ".inst.dps",
+                                       tar_pipe_topologies[beamNr] + ".inst.dps",
+                                       settings['cluster'],
+                                       status,
+                                       nr_tasks,
+                                       nr_cores_per_task,
+                                       miscParameters)
 
             elif processing == 'Pulsar':
                 # tar_obs_topology_MultiObs = tar_obs_topology + '.' + str(beamNr)
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/prefactor HBA SDF-PPE.txt b/SAS/XML_generator/test/test_regression.in_data/txt/prefactor HBA SDF-PPE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..198b2b6f6e6d5ff386c71edf7c3f3c4409773ec9
--- /dev/null
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/prefactor HBA SDF-PPE.txt	
@@ -0,0 +1,166 @@
+projectName=SDF-PPE
+mainFolderName=P181+42P189+45HBA
+mainFolderDescription=Preprocessing:HBA Dual Inner, 110-190MHz, 8bits, 48MHz@144MHz, 1s, 64ch/sb
+BLOCK
+split_targets = F                       # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
+calibration = external                  # internal / external / none
+create_calibrator_observations = T      # create calibration observations before target observations? (ignored if calibration = none)
+create_target_cal_beam = F              # create a calibration beam in the target observation(s)? (ignored if calibration = none)
+processing=Prefactor                         # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=standard                    # can be one of MSSS, standard, none
+cluster = CEP4                          # CEP2 or CEP4 or <empty> (default is CEP2 right now)
+repeat=1                                # the number of repeats of this block
+nr_tasks=122
+nr_cores_per_task=2
+storagemanager=dysco
+packageName=20190311_P181+42P189+45        # the name that will be given to the package folder that contains this block's observation and pipelines
+packageDescription=HBA Dual Inner, 110-190MHz, 8bits, 96MHz@144MHz, 1s, 64ch/sb
+packageTag=                             # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8
+integrationTime=1.0
+channelsPerSubband=64
+stationList=all                      # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+nrSubbandsPerImage=1
+###### Which data types should be produced: ######
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+###### Coherent Stokes parameters ######
+subbandsPerFileCS=512
+numberCollapsedChannelsCS=16
+stokesDownsamplingStepsCS=128
+whichCS=IQUV
+###### Incoherent Stokes parameters ######
+#subbandsPerFileIS=16
+#numberCollapsedChannelsIS=4
+#stokesDownsamplingStepsIS=12
+#whichIS=IQUV
+flaggingStrategy=HBAdefault             # flagging strategy used for AOflagger
+calibratorDuration_s=600                # duration of calibration observations in seconds
+targetDuration_s=14400                    # duration of target observations in seconds
+###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
+#Global_TAB=
+#c;05:34:51.94;+22:00:52.2              # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
+#Global_TABrings=1;0.1                   # nr of tabrings and tabring size
+#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
+#Global_Demix=16;4;64;10;CasA,CygA;
+#Global_Subbands=104..347;244
+Global_Subbands=104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..255,257..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447;243
+#Global_Subbands=104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447;244
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2019-03-11 22:01:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+calibratorBeam=
+08:13:36.07;+48:13:02.5;3C196;;;;;T;600
+BBS=3C196;;;T
+Demix=4;2;64;10
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+targetBeams=
+12:20:37.772;+43:30:0.727;P181P189REF;256;1;;;F;31200
+Demix=4;1;64;10;;;T
+#
+12:05:11.792;42:13:30.637;P181+42;;;;;T;31200
+BBS=X;;;T
+Demix=4;1;64;10;;;F
+12:36:03.752;44:46:30.816;P189+45;;;;;T;31200
+BBS=X;;;T
+Demix=4;1;64;10;;;F
+
+
+
+BLOCK
+split_targets = F                       # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
+calibration = none                  # internal / external / none
+create_calibrator_observations = T      # create calibration observations before target observations? (ignored if calibration = none)
+create_target_cal_beam = F              # create a calibration beam in the target observation(s)? (ignored if calibration = none)
+processing=Preprocessing                # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none                    # can be one of MSSS, standard, none
+cluster = CEP4                          # CEP2 or CEP4 or <empty> (default is CEP2 right now)
+repeat=1                                # the number of repeats of this block
+nr_tasks=122
+nr_cores_per_task=2
+storagemanager=dysco
+packageName=20190312_3C295              # the name that will be given to the package folder that contains this block's observation and pipelines
+packageDescription=HBA Dual Inner, 110-190MHz, 8bits, 96MHz@144MHz, 1s, 64ch/sb
+packageTag=                             # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8
+integrationTime=1.0
+channelsPerSubband=64
+stationList=all                        # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+###### Which data types should be produced: ######
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+###### Coherent Stokes parameters ######
+subbandsPerFileCS=512
+numberCollapsedChannelsCS=16
+stokesDownsamplingStepsCS=128
+whichCS=IQUV
+###### Incoherent Stokes parameters ######
+#subbandsPerFileIS=16
+#numberCollapsedChannelsIS=4
+#stokesDownsamplingStepsIS=12
+#whichIS=IQUV
+flaggingStrategy=HBAdefault             # flagging strategy used for AOflagger
+#calibratorDuration_s=600                # duration of calibration observations in seconds
+targetDuration_s=600                    # duration of target observations in seconds
+###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
+#Global_TAB=
+#c;05:34:51.94;+22:00:52.2              # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
+#Global_TABrings=1;0.1                   # nr of tabrings and tabring size
+#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
+#Global_Demix=16;4;64;10;CasA,CygA;
+#Global_Subbands=104..347;244
+Global_Subbands=104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..255,257..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447;243
+#Global_Subbands=104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447;244
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2019-03-12 02:01:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+calibratorBeam=
+08:13:36.07;+48:13:02.50;3C196;;;;;T;600
+#14:11:20.519;+52:12:09.97;3C295;;;;;T;600
+BBS=3C295;;;T
+Demix=4;2;64;10
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+targetBeams=
+14:11:20.519;+52:12:09.97;3C295;;;;;T;600
+BBS=3C295;;;T
+Demix=4;1;64;10;;;F
+#Pulsar=B0531+21;;T;;;;;;;;;;;;;;;;;;
+#0.0417300951946;0.00558069028325;Sun;54..297;244;;;T;8100
+#Demix=16;1;16;1
+BLOCK
\ No newline at end of file
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/prefactor LBA SDF-PPE.txt b/SAS/XML_generator/test/test_regression.in_data/txt/prefactor LBA SDF-PPE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..889d3343005b15ea6918fff7f78bccbd837c481a
--- /dev/null
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/prefactor LBA SDF-PPE.txt	
@@ -0,0 +1,84 @@
+projectName=SDF-PPE
+mainFolderName=Clock-Tec sep LBA
+mainFolderDescription= W3 Preprocessing: LBA Outer, 30-90MHz, 8bits, 1s, 64ch/sb
+BLOCK
+split_targets = F                       # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
+calibration = internal                  # internal / external / none
+create_calibrator_observations = T      # create calibration observations before target observations? (ignored if calibration = none)
+create_target_cal_beam = F              # create a calibration beam in the target observation(s)? (ignored if calibration = none)
+processing=Prefactor                    # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=standard                # can be one of MSSS, standard, none
+cluster = CEP4                          # CEP2 or CEP4 or <empty> (default is CEP2 right now)
+repeat=1   
+nr_tasks=122
+nr_cores_per_task=2
+storagemanager=
+packageName=20190305_3C048W3             # the name that will be given to the package folder that contains this block's observation and pipelines
+packageDescription=LBA Outer, 30-90MHz, 8bits, 1s, 64ch/sb
+packageTag=                             # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
+antennaMode=LBA Outer
+clock=200 MHz
+instrumentFilter=30-90 MHz
+numberOfBitsPerSample=8
+integrationTime=1.0
+channelsPerSubband=64
+stationList=all                      # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+nrSubbandsPerImage=1
+###### Which data types should be produced: ######
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+###### Coherent Stokes parameters ######
+subbandsPerFileCS=512
+numberCollapsedChannelsCS=16
+stokesDownsamplingStepsCS=128
+whichCS=IQUV
+###### Incoherent Stokes parameters ######
+#subbandsPerFileIS=16
+#numberCollapsedChannelsIS=4
+#stokesDownsamplingStepsIS=12
+#whichIS=IQUV
+flaggingStrategy=LBAdefault             # flagging strategy used for AOflagger
+calibratorDuration_s=14400               # duration of calibration observations in seconds
+targetDuration_s=14400                   # duration of target observations in seconds
+###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
+#Global_TAB=
+#c;05:34:51.94;+22:00:52.2              # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
+#Global_TABrings=1;0.1                   # nr of tabrings and tabring size
+#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
+#Global_Demix=16;4;64;8;CasA,CygA;
+Global_Subbands=154..397;244
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2019-03-05 13:00:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+calibratorBeam=
+08:13:36.07;+48:13:02.5;3C196;;;;;T;600
+#14:11:20.519;+52:12:09.97;3C295;;;;;T;600
+BBS=3C196;;;T
+Demix=4;2;64;10
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+targetBeams=
+01:37:41.30;+33:09:35.134;3C048;;;;;T;600
+BBS=X;;;T
+Demix=4;1;64;10;CasA,CygA;;T
+02:27:04.1;+61:52:27.1;W3;;;;;T;14400
+BBS=X;;;T
+Demix=4;1;64;10;CasA,CygA;;T
+#Pulsar=B0531+21;;T;;;;;;;;;;;;;;;;;;
+#0.0417300951946;0.00558069028325;Sun;54..297;244;;;T;8100
+#Demix=16;1;16;1
+BLOCK
\ No newline at end of file
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/prefactor_LBA.txt b/SAS/XML_generator/test/test_regression.in_data/txt/prefactor_LBA.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c9b6ce299f1836314a78d90d34c5a654a544a7c3
--- /dev/null
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/prefactor_LBA.txt
@@ -0,0 +1,98 @@
+################################################################################
+## Parameters for project: PREFACTOR
+################################################################################
+
+
+################################################################################
+## RUN 06: 2 targets -- duration:  21600s (  6.00h)
+## HD 156279, 17:12:23.19,+63:20:8.0
+## 3C380, 18:29:31.72,+48:44:46.95
+ 
+## PARAMETER FILE SETUP 
+projectName=PREFACTOR
+mainFolderName=HD152679
+mainFolderDescription=LBA outer 8ch/sb 1s Dutch
+
+BLOCK
+
+split_targets = F # T/F
+calibration = external # internal / external / none
+create_calibrator_observations = T # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Prefactor # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=standard # can be one of MSSS, standard, none
+nrSubbandsPerImage=10
+repeat=1 # the number of repeats of this block
+
+packageName=20190616 # name of package folder containing observation/pipelines
+packageDescription=Prefactor observation
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=LBA Outer
+clock=200 MHz
+instrumentFilter=30-90 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=1.0
+channelsPerSubband=64
+stationList=nl
+tbbPiggybackAllowed=F
+aartfaacPiggybackAllowed=F
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=LBAdefault
+calibratorDuration_s=21600                      # duration of calibration observations in seconds
+targetDuration_s=21600                       # duration of target observations in seconds
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-06-16 20:00:00
+# timeStep in seconds
+timeStep1=60
+timeStep2=60
+
+###### Pipeline settings ######
+## GENERAL INFO
+## Processing mode: Calibration
+## Demixing requested: CygA CasA
+
+Global_Demix=8;1;8;1;CygA,CasA
+
+##targetBeams=  ## MAKE SURE TO SELECT THIS PROPERLY
+calibratorBeam=
+18:29:31.72;+48:44:46.95;3C380;154..397;244;;;T;43200
+BBS:3C380;;;T
+
+# BBS: Add parameters if BBS needed
+# Pulsar: Add parameters if pulsar pipeline needed
+
+
+targetBeams=
+17:12:23.20;+63:21:07.5;HD156279;154..393;240;;;T;43200
+BBS:3C380;;;T
+
+# BBS: Add parameters if BBS needed
+# Pulsar: Add parameters if pulsar pipeline needed
+
+## Demixing requested: CygA CasA
+
+
+
+################################################################################
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/prefactor HBA SDF-PPE.xml b/SAS/XML_generator/test/test_regression.in_data/xml/prefactor HBA SDF-PPE.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a6c0ff7c9769552530dd0517e7dbddbda1c73548
--- /dev/null
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/prefactor HBA SDF-PPE.xml	
@@ -0,0 +1,1005 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <lofar:project xmlns:lofar="http://www.astron.nl/MoM2-Lofar" xmlns:mom2="http://www.astron.nl/MoM2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.astron.nl/MoM2-Lofar http://lofar.astron.nl:8080/mom3/schemas/LofarMoM2.xsd http://www.astron.nl/MoM2 http://lofar.astron.nl:8080/mom3/schemas/MoM2.xsd ">
+  <version>3.2.0</version>
+  <template version="3.2.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 3.2.0</description>
+  </template>
+  <name>SDF-PPE</name>
+  <children>
+   <item index="0">
+    <lofar:folder topology_parent="false">
+    <name>P181+42P189+45HBA</name>
+    <description>Preprocessing:HBA Dual Inner, 110-190MHz, 8bits, 48MHz@144MHz, 1s, 64ch/sb</description>
+    <children>
+   <item index="0">
+        <lofar:folder topology_parent="true">
+          <topology>0</topology>
+          <name>20190311_P181+42P189+45</name>
+          <description>HBA Dual Inner, 110-190MHz, 8bits, 96MHz@144MHz, 1s, 64ch/sb (Prefactor)</description>
+          <children>
+          <item index="0">
+                <lofar:observation>
+                  <name>3C196/1/CO</name>
+                  <description>3C196/1/CO (Calibration Observation)</description>
+                  <topology>B0.1.C</topology>
+                  <predecessor_topology></predecessor_topology>
+                  <currentStatus>
+                    <mom2:openedStatus/>
+                  </currentStatus>
+                  <lofar:observationAttributes>
+                    <observationId>
+                    </observationId>
+                    <name>3C196/1/CO</name>
+                    <projectName>SDF-PPE</projectName>
+                    <instrument>Beam Observation</instrument>
+                    <defaultTemplate>BeamObservation</defaultTemplate>
+                    <tbbPiggybackAllowed>true</tbbPiggybackAllowed>
+                    <aartfaacPiggybackAllowed>true</aartfaacPiggybackAllowed>
+                    <userSpecification>
+                      <correlatedData>true</correlatedData>
+                      <coherentStokesData>false</coherentStokesData>
+                      <incoherentStokesData>false</incoherentStokesData>
+                      <antenna>HBA Dual Inner</antenna>
+                      <clock mode="200 MHz"/>
+                      <instrumentFilter>110-190 MHz</instrumentFilter>
+                      <integrationInterval>1.0</integrationInterval>
+                      <channelsPerSubband>64</channelsPerSubband>
+                      <coherentDedisperseChannels>false</coherentDedisperseChannels>
+                      <tiedArrayBeams>
+                        <flyseye>false</flyseye>
+                      </tiedArrayBeams>
+                      <stokes>
+                        <integrateChannels>false</integrateChannels>
+                        <subbandsPerFileCS>512</subbandsPerFileCS>
+                        <numberCollapsedChannelsCS>16</numberCollapsedChannelsCS>
+                        <stokesDownsamplingStepsCS>128</stokesDownsamplingStepsCS>
+                        <whichCS>IQUV</whichCS>
+                        <subbandsPerFileIS></subbandsPerFileIS>
+                        <numberCollapsedChannelsIS></numberCollapsedChannelsIS>
+                        <stokesDownsamplingStepsIS></stokesDownsamplingStepsIS>
+                        <whichIS></whichIS>
+                      </stokes>
+                      <stationSet>Custom</stationSet>
+                      <stations>CS001,CS002,CS003,CS004,CS005,CS006,CS007,CS011,CS013,CS017,CS021,CS024,CS026,CS028,CS030,CS031,CS032,CS101,CS103,CS201,CS301,CS302,CS401,CS501,DE601,DE602,DE603,DE604,DE605,DE609,FR606,IE613,PL610,PL611,PL612,RS106,RS205,RS208,RS210,RS305,RS306,RS307,RS310,RS406,RS407,RS409,RS503,RS508,RS509,SE607,UK608</stations>
+                      <timeFrame>UT</timeFrame>
+                      <startTime>2019-03-11T22:01:00</startTime>
+                      <endTime>2019-03-11T22:11:00</endTime>
+                      <duration>600</duration>
+                      <bypassPff>false</bypassPff>
+                      <enableSuperterp>false</enableSuperterp>
+                      <numberOfBitsPerSample>8</numberOfBitsPerSample>
+                    </userSpecification>
+                  </lofar:observationAttributes>
+                  <children>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>3C196</name>
+                        <description>3C196</description>
+                        <topology>B0.1.C.SAP000</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Calibration</measurementType>
+                          <specification>
+                            <targetName>3C196</targetName>
+                            <ra>123.400291667</ra>
+                            <dec>48.2173611111</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..255,257..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings></nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.C.SAP000.uv.dps</name>
+                    <topology>B0.1.C.SAP000.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+</children>
+                </lofar:observation>
+                </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.CPCP</topology>
+                <predecessor_topology>B0.1.C</predecessor_topology>
+                <name>3C196/1/CPCP</name>
+                <description>3C196/1/CPCP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>HBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>2</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget></ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.C.SAP000.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.CPCP.uv.dps</name>
+                      <topology>B0.1.CPCP.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                <topology>B0.1.CPC</topology>
+                <predecessor_topology>B0.1.CPCP</predecessor_topology>
+                <name>3C196/1/CPC</name>
+                <description>3C196/1/CPC (Cal Pipe Calibrator)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>MSSS target pre-processing</defaultTemplate>
+                  <flaggingStrategy>HBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <skyModelDatabase>3C196</skyModelDatabase>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>2</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget></ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable></beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.CPCP.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:instrumentModelDataProduct>
+                      <name>B0.1.CPC.inst.dps</name>
+                      <topology>B0.1.CPC.inst.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:instrumentModelDataProduct>
+                  </item>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.CPC.uv.dps</name>
+                      <topology>B0.1.CPC.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+          <item index="0">
+                <lofar:observation>
+                  <name>P181P189REF/1/TO</name>
+                  <description>P181P189REF/1/TO (Target Observation)</description>
+                  <topology>B0.1.T</topology>
+                  <predecessor_topology>B0.1.C</predecessor_topology>
+                  <currentStatus>
+                    <mom2:openedStatus/>
+                  </currentStatus>
+                  <lofar:observationAttributes>
+                    <observationId>
+                    </observationId>
+                    <name>P181P189REF/1/TO</name>
+                    <projectName>SDF-PPE</projectName>
+                    <instrument>Beam Observation</instrument>
+                    <defaultTemplate>BeamObservation</defaultTemplate>
+                    <tbbPiggybackAllowed>true</tbbPiggybackAllowed>
+                    <aartfaacPiggybackAllowed>true</aartfaacPiggybackAllowed>
+                    <userSpecification>
+                      <correlatedData>true</correlatedData>
+                      <coherentStokesData>false</coherentStokesData>
+                      <incoherentStokesData>false</incoherentStokesData>
+                      <antenna>HBA Dual Inner</antenna>
+                      <clock mode="200 MHz"/>
+                      <instrumentFilter>110-190 MHz</instrumentFilter>
+                      <integrationInterval>1.0</integrationInterval>
+                      <channelsPerSubband>64</channelsPerSubband>
+                      <coherentDedisperseChannels>false</coherentDedisperseChannels>
+                      <tiedArrayBeams>
+                        <flyseye>false</flyseye>
+                      </tiedArrayBeams>
+                      <stokes>
+                        <integrateChannels>false</integrateChannels>
+                        <subbandsPerFileCS>512</subbandsPerFileCS>
+                        <numberCollapsedChannelsCS>16</numberCollapsedChannelsCS>
+                        <stokesDownsamplingStepsCS>128</stokesDownsamplingStepsCS>
+                        <whichCS>IQUV</whichCS>
+                        <subbandsPerFileIS></subbandsPerFileIS>
+                        <numberCollapsedChannelsIS></numberCollapsedChannelsIS>
+                        <stokesDownsamplingStepsIS></stokesDownsamplingStepsIS>
+                        <whichIS></whichIS>
+                      </stokes>
+                      <stationSet>Custom</stationSet>
+                      <stations>CS001,CS002,CS003,CS004,CS005,CS006,CS007,CS011,CS013,CS017,CS021,CS024,CS026,CS028,CS030,CS031,CS032,CS101,CS103,CS201,CS301,CS302,CS401,CS501,DE601,DE602,DE603,DE604,DE605,DE609,FR606,IE613,PL610,PL611,PL612,RS106,RS205,RS208,RS210,RS305,RS306,RS307,RS310,RS406,RS407,RS409,RS503,RS508,RS509,SE607,UK608</stations>
+                      <timeFrame>UT</timeFrame>
+                      <startTime>2019-03-11T22:12:00</startTime>
+                      <endTime>2019-03-12T02:12:00</endTime>
+                      <duration>14400</duration>
+                      <bypassPff>false</bypassPff>
+                      <enableSuperterp>false</enableSuperterp>
+                      <numberOfBitsPerSample>8</numberOfBitsPerSample>
+                    </userSpecification>
+                  </lofar:observationAttributes>
+                  <children>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>P181P189REF</name>
+                        <description>P181P189REF</description>
+                        <topology>B0.1.T.SAP000</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Target</measurementType>
+                          <specification>
+                            <targetName>P181P189REF</targetName>
+                            <ra>185.157383333</ra>
+                            <dec>43.5002019444</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>256</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings>0</nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.T.SAP000.uv.dps</name>
+                    <topology>B0.1.T.SAP000.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>P181+42</name>
+                        <description>P181+42</description>
+                        <topology>B0.1.T.SAP001</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Target</measurementType>
+                          <specification>
+                            <targetName>P181+42</targetName>
+                            <ra>181.299133333</ra>
+                            <dec>42.2251769444</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..255,257..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings>0</nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.T.SAP001.uv.dps</name>
+                    <topology>B0.1.T.SAP001.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>P189+45</name>
+                        <description>P189+45</description>
+                        <topology>B0.1.T.SAP002</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Target</measurementType>
+                          <specification>
+                            <targetName>P189+45</targetName>
+                            <ra>189.015633333</ra>
+                            <dec>44.7752266667</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..255,257..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings>0</nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.T.SAP002.uv.dps</name>
+                    <topology>B0.1.T.SAP002.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+</children>
+                </lofar:observation>
+                </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.PPT1</topology>
+                <predecessor_topology>B0.1.T</predecessor_topology>
+                <name>P181+42/1.1/TPP</name>
+                <description>P181+42/1.1/TPP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>HBAdefault</flaggingStrategy>
+                  <duration>31200</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>false</ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.T.SAP001.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.PPT1.uv.dps</name>
+                      <topology>B0.1.PPT1.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+<item index="0">
+                  <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                    <topology>B0.1.PT1</topology>
+                    <predecessor_topology>B0.1.PPT1,B0.1.CPC</predecessor_topology>
+                    <name>P181+42/1.1/TP</name>
+                    <description>P181+42/1.1/TP (Target Pipeline)</description>
+                    <currentStatus>
+                      <mom2:openedStatus/>
+                    </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                    <pipelineAttributes>
+                      <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
+                      <flaggingStrategy>HBAdefault</flaggingStrategy>
+                      <duration>31200</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>false</ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable>true</beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                    <usedDataProducts>
+                      <item>
+                        <lofar:uvDataProduct topology="B0.1.PPT1.uv.dps">
+                          <name>B0.1.PPT1.uv.dps</name>
+                        </lofar:uvDataProduct>
+                      </item>
+                      <item>
+                        <lofar:instrumentModelDataProduct topology="B0.1.CPC.inst.dps">
+                          <name>B0.1.CPC.inst.dps</name>
+                        </lofar:instrumentModelDataProduct>
+                      </item>
+                    </usedDataProducts>
+                    <resultDataProducts>
+                        <item>
+                          <lofar:uvDataProduct>
+                            <name>B0.1.PT1.uv.dps</name>
+                            <topology>B0.1.PT1.uv.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:uvDataProduct>
+                        </item>
+                                                <item>
+                          <lofar:instrumentModelDataProduct>
+                            <name>B0.1.PT1.inst.dps</name>
+                            <topology>B0.1.PT1.inst.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:instrumentModelDataProduct>
+                        </item>
+                    </resultDataProducts>
+                    </lofar:pipeline>
+                  </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.PPT2</topology>
+                <predecessor_topology>B0.1.T</predecessor_topology>
+                <name>P189+45/1.2/TPP</name>
+                <description>P189+45/1.2/TPP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>HBAdefault</flaggingStrategy>
+                  <duration>31200</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>false</ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.T.SAP002.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.PPT2.uv.dps</name>
+                      <topology>B0.1.PPT2.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+<item index="0">
+                  <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                    <topology>B0.1.PT2</topology>
+                    <predecessor_topology>B0.1.PPT2,B0.1.CPC</predecessor_topology>
+                    <name>P189+45/1.2/TP</name>
+                    <description>P189+45/1.2/TP (Target Pipeline)</description>
+                    <currentStatus>
+                      <mom2:openedStatus/>
+                    </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                    <pipelineAttributes>
+                      <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
+                      <flaggingStrategy>HBAdefault</flaggingStrategy>
+                      <duration>31200</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>false</ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable>true</beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                    <usedDataProducts>
+                      <item>
+                        <lofar:uvDataProduct topology="B0.1.PPT2.uv.dps">
+                          <name>B0.1.PPT2.uv.dps</name>
+                        </lofar:uvDataProduct>
+                      </item>
+                      <item>
+                        <lofar:instrumentModelDataProduct topology="B0.1.CPC.inst.dps">
+                          <name>B0.1.CPC.inst.dps</name>
+                        </lofar:instrumentModelDataProduct>
+                      </item>
+                    </usedDataProducts>
+                    <resultDataProducts>
+                        <item>
+                          <lofar:uvDataProduct>
+                            <name>B0.1.PT2.uv.dps</name>
+                            <topology>B0.1.PT2.uv.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:uvDataProduct>
+                        </item>
+                                                <item>
+                          <lofar:instrumentModelDataProduct>
+                            <name>B0.1.PT2.inst.dps</name>
+                            <topology>B0.1.PT2.inst.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:instrumentModelDataProduct>
+                        </item>
+                    </resultDataProducts>
+                    </lofar:pipeline>
+                  </item>
+<item index="0">
+        <lofar:pipeline xsi:type="lofar:ImagingPipelineType">
+          <topology>B0.PI1</topology>
+          <predecessor_topology>B0.1.PT1</predecessor_topology>
+          <name>P181+42/IM</name>
+          <description>P181+42/IM (Imaging pipeline beam 1)</description>
+          <currentStatus>
+            <mom2:openedStatus/>
+          </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <imagingPipelineAttributes>
+            <defaultTemplate>Imaging Pipeline HBA</defaultTemplate>
+            <duration>0</duration>
+            <nrOfOutputSkyImage>243</nrOfOutputSkyImage>
+            <imagingParameters>
+              <nrSlicesPerImage>1</nrSlicesPerImage>
+              <nrSubbandsPerImage>1</nrSubbandsPerImage>
+              <maxBaseline></maxBaseline>
+              <fieldOfView></fieldOfView>
+              <weight></weight>
+              <robust></robust>
+              <iterations></iterations>
+              <threshold></threshold>
+              <uvMin></uvMin>
+              <uvMax></uvMax>
+              <stokes></stokes>
+            </imagingParameters>
+
+          </imagingPipelineAttributes>
+                <usedDataProducts>
+                <item>
+              <lofar:uvDataProduct topology="B0.1.PT1.uv.dps">
+                <name>B0.1.PT1.uv.dps</name>
+              </lofar:uvDataProduct>
+            </item>
+               </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:skyImageDataProduct>
+                      <name>B0.PI1.sky.dps</name>
+                      <topology>B0.PI1.sky.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:skyImageDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+<item index="0">
+        <lofar:pipeline xsi:type="lofar:ImagingPipelineType">
+          <topology>B0.PI2</topology>
+          <predecessor_topology>B0.1.PT2</predecessor_topology>
+          <name>P189+45/IM</name>
+          <description>P189+45/IM (Imaging pipeline beam 2)</description>
+          <currentStatus>
+            <mom2:openedStatus/>
+          </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <imagingPipelineAttributes>
+            <defaultTemplate>Imaging Pipeline HBA</defaultTemplate>
+            <duration>0</duration>
+            <nrOfOutputSkyImage>243</nrOfOutputSkyImage>
+            <imagingParameters>
+              <nrSlicesPerImage>1</nrSlicesPerImage>
+              <nrSubbandsPerImage>1</nrSubbandsPerImage>
+              <maxBaseline></maxBaseline>
+              <fieldOfView></fieldOfView>
+              <weight></weight>
+              <robust></robust>
+              <iterations></iterations>
+              <threshold></threshold>
+              <uvMin></uvMin>
+              <uvMax></uvMax>
+              <stokes></stokes>
+            </imagingParameters>
+
+          </imagingPipelineAttributes>
+                <usedDataProducts>
+                <item>
+              <lofar:uvDataProduct topology="B0.1.PT2.uv.dps">
+                <name>B0.1.PT2.uv.dps</name>
+              </lofar:uvDataProduct>
+            </item>
+               </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:skyImageDataProduct>
+                      <name>B0.PI2.sky.dps</name>
+                      <topology>B0.PI2.sky.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:skyImageDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+</children>
+  </lofar:folder>
+  </item>
+   <item index="0">
+        <lofar:folder topology_parent="true">
+          <topology>1</topology>
+          <name>20190312_3C295</name>
+          <description>HBA Dual Inner, 110-190MHz, 8bits, 96MHz@144MHz, 1s, 64ch/sb (Preprocessing)</description>
+          <children>
+          <item index="0">
+                <lofar:observation>
+                  <name>3C295/1/TO</name>
+                  <description>3C295/1/TO (Target Observation)</description>
+                  <topology>B1.1.T</topology>
+                  <predecessor_topology></predecessor_topology>
+                  <currentStatus>
+                    <mom2:openedStatus/>
+                  </currentStatus>
+                  <lofar:observationAttributes>
+                    <observationId>
+                    </observationId>
+                    <name>3C295/1/TO</name>
+                    <projectName>SDF-PPE</projectName>
+                    <instrument>Beam Observation</instrument>
+                    <defaultTemplate>BeamObservation</defaultTemplate>
+                    <tbbPiggybackAllowed>true</tbbPiggybackAllowed>
+                    <aartfaacPiggybackAllowed>true</aartfaacPiggybackAllowed>
+                    <userSpecification>
+                      <correlatedData>true</correlatedData>
+                      <coherentStokesData>false</coherentStokesData>
+                      <incoherentStokesData>false</incoherentStokesData>
+                      <antenna>HBA Dual Inner</antenna>
+                      <clock mode="200 MHz"/>
+                      <instrumentFilter>110-190 MHz</instrumentFilter>
+                      <integrationInterval>1.0</integrationInterval>
+                      <channelsPerSubband>64</channelsPerSubband>
+                      <coherentDedisperseChannels>false</coherentDedisperseChannels>
+                      <tiedArrayBeams>
+                        <flyseye>false</flyseye>
+                      </tiedArrayBeams>
+                      <stokes>
+                        <integrateChannels>false</integrateChannels>
+                        <subbandsPerFileCS>512</subbandsPerFileCS>
+                        <numberCollapsedChannelsCS>16</numberCollapsedChannelsCS>
+                        <stokesDownsamplingStepsCS>128</stokesDownsamplingStepsCS>
+                        <whichCS>IQUV</whichCS>
+                        <subbandsPerFileIS></subbandsPerFileIS>
+                        <numberCollapsedChannelsIS></numberCollapsedChannelsIS>
+                        <stokesDownsamplingStepsIS></stokesDownsamplingStepsIS>
+                        <whichIS></whichIS>
+                      </stokes>
+                      <stationSet>Custom</stationSet>
+                      <stations>CS001,CS002,CS003,CS004,CS005,CS006,CS007,CS011,CS013,CS017,CS021,CS024,CS026,CS028,CS030,CS031,CS032,CS101,CS103,CS201,CS301,CS302,CS401,CS501,DE601,DE602,DE603,DE604,DE605,DE609,FR606,IE613,PL610,PL611,PL612,RS106,RS205,RS208,RS210,RS305,RS306,RS307,RS310,RS406,RS407,RS409,RS503,RS508,RS509,SE607,UK608</stations>
+                      <timeFrame>UT</timeFrame>
+                      <startTime>2019-03-12T02:01:00</startTime>
+                      <endTime>2019-03-12T02:11:00</endTime>
+                      <duration>600</duration>
+                      <bypassPff>false</bypassPff>
+                      <enableSuperterp>false</enableSuperterp>
+                      <numberOfBitsPerSample>8</numberOfBitsPerSample>
+                    </userSpecification>
+                  </lofar:observationAttributes>
+                  <children>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>3C295</name>
+                        <description>3C295</description>
+                        <topology>B1.1.T.SAP000</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Target</measurementType>
+                          <specification>
+                            <targetName>3C295</targetName>
+                            <ra>212.835495833</ra>
+                            <dec>52.2027694444</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>104..136,138..163,165..180,182..184,187..209,212..213,215..240,242..255,257..273,275..300,302..328,330..347,349,364,372,380,388,396,404,413,421,430,438,447</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings>0</nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B1.1.T.SAP000.uv.dps</name>
+                    <topology>B1.1.T.SAP000.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+</children>
+                </lofar:observation>
+                </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B1.1.PT0</topology>
+                <predecessor_topology>B1.1.T</predecessor_topology>
+                <name>3C295/1.0/TP</name>
+                <description>3C295/1.0/TP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>HBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>false</ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": "dysco"}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B1.1.T.SAP000.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B1.1.PT0.uv.dps</name>
+                      <topology>B1.1.PT0.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+</children>
+  </lofar:folder>
+  </item>
+</children>
+  </lofar:folder>
+  </item>
+          </children>
+  </lofar:project>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/prefactor LBA SDF-PPE.xml b/SAS/XML_generator/test/test_regression.in_data/xml/prefactor LBA SDF-PPE.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fd9759fcd8df335cef43516be03bef02fc10d1f
--- /dev/null
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/prefactor LBA SDF-PPE.xml	
@@ -0,0 +1,971 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <lofar:project xmlns:lofar="http://www.astron.nl/MoM2-Lofar" xmlns:mom2="http://www.astron.nl/MoM2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.astron.nl/MoM2-Lofar http://lofar.astron.nl:8080/mom3/schemas/LofarMoM2.xsd http://www.astron.nl/MoM2 http://lofar.astron.nl:8080/mom3/schemas/MoM2.xsd ">
+  <version>3.2.0</version>
+  <template version="3.2.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 3.2.0</description>
+  </template>
+  <name>SDF-PPE</name>
+  <children>
+   <item index="0">
+    <lofar:folder topology_parent="false">
+    <name>Clock-Tec sep LBA</name>
+    <description>W3 Preprocessing: LBA Outer, 30-90MHz, 8bits, 1s, 64ch/sb</description>
+    <children>
+   <item index="0">
+        <lofar:folder topology_parent="true">
+          <topology>0</topology>
+          <name>20190305_3C048W3</name>
+          <description>LBA Outer, 30-90MHz, 8bits, 1s, 64ch/sb (Prefactor)</description>
+          <children>
+          <item index="0">
+                <lofar:observation>
+                  <name>3C196/1/CO</name>
+                  <description>3C196/1/CO (Calibration Observation)</description>
+                  <topology>B0.1.C</topology>
+                  <predecessor_topology></predecessor_topology>
+                  <currentStatus>
+                    <mom2:openedStatus/>
+                  </currentStatus>
+                  <lofar:observationAttributes>
+                    <observationId>
+                    </observationId>
+                    <name>3C196/1/CO</name>
+                    <projectName>SDF-PPE</projectName>
+                    <instrument>Beam Observation</instrument>
+                    <defaultTemplate>BeamObservation</defaultTemplate>
+                    <tbbPiggybackAllowed>true</tbbPiggybackAllowed>
+                    <aartfaacPiggybackAllowed>true</aartfaacPiggybackAllowed>
+                    <userSpecification>
+                      <correlatedData>true</correlatedData>
+                      <coherentStokesData>false</coherentStokesData>
+                      <incoherentStokesData>false</incoherentStokesData>
+                      <antenna>LBA Outer</antenna>
+                      <clock mode="200 MHz"/>
+                      <instrumentFilter>30-90 MHz</instrumentFilter>
+                      <integrationInterval>1.0</integrationInterval>
+                      <channelsPerSubband>64</channelsPerSubband>
+                      <coherentDedisperseChannels>false</coherentDedisperseChannels>
+                      <tiedArrayBeams>
+                        <flyseye>false</flyseye>
+                      </tiedArrayBeams>
+                      <stokes>
+                        <integrateChannels>false</integrateChannels>
+                        <subbandsPerFileCS>512</subbandsPerFileCS>
+                        <numberCollapsedChannelsCS>16</numberCollapsedChannelsCS>
+                        <stokesDownsamplingStepsCS>128</stokesDownsamplingStepsCS>
+                        <whichCS>IQUV</whichCS>
+                        <subbandsPerFileIS></subbandsPerFileIS>
+                        <numberCollapsedChannelsIS></numberCollapsedChannelsIS>
+                        <stokesDownsamplingStepsIS></stokesDownsamplingStepsIS>
+                        <whichIS></whichIS>
+                      </stokes>
+                      <stationSet>Custom</stationSet>
+                      <stations>CS001,CS002,CS003,CS004,CS005,CS006,CS007,CS011,CS013,CS017,CS021,CS024,CS026,CS028,CS030,CS031,CS032,CS101,CS103,CS201,CS301,CS302,CS401,CS501,DE601,DE602,DE603,DE604,DE605,DE609,FR606,IE613,PL610,PL611,PL612,RS106,RS205,RS208,RS210,RS305,RS306,RS307,RS310,RS406,RS407,RS409,RS503,RS508,RS509,SE607,UK608</stations>
+                      <timeFrame>UT</timeFrame>
+                      <startTime>2019-03-05T13:00:00</startTime>
+                      <endTime>2019-03-05T17:00:00</endTime>
+                      <duration>14400</duration>
+                      <bypassPff>false</bypassPff>
+                      <enableSuperterp>false</enableSuperterp>
+                      <numberOfBitsPerSample>8</numberOfBitsPerSample>
+                    </userSpecification>
+                  </lofar:observationAttributes>
+                  <children>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>3C196</name>
+                        <description>3C196</description>
+                        <topology>B0.1.C.SAP000</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Calibration</measurementType>
+                          <specification>
+                            <targetName>3C196</targetName>
+                            <ra>123.400291667</ra>
+                            <dec>48.2173611111</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>154..397</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings></nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.C.SAP000.uv.dps</name>
+                    <topology>B0.1.C.SAP000.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+</children>
+                </lofar:observation>
+                </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.CPCP</topology>
+                <predecessor_topology>B0.1.C</predecessor_topology>
+                <name>3C196/1/CPCP</name>
+                <description>3C196/1/CPCP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>LBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>2</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget></ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.C.SAP000.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.CPCP.uv.dps</name>
+                      <topology>B0.1.CPCP.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                <topology>B0.1.CPC</topology>
+                <predecessor_topology>B0.1.CPCP</predecessor_topology>
+                <name>3C196/1/CPC</name>
+                <description>3C196/1/CPC (Cal Pipe Calibrator)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>MSSS target pre-processing</defaultTemplate>
+                  <flaggingStrategy>LBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <skyModelDatabase>3C196</skyModelDatabase>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>2</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget></ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable></beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.CPCP.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:instrumentModelDataProduct>
+                      <name>B0.1.CPC.inst.dps</name>
+                      <topology>B0.1.CPC.inst.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:instrumentModelDataProduct>
+                  </item>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.CPC.uv.dps</name>
+                      <topology>B0.1.CPC.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+          <item index="0">
+                <lofar:observation>
+                  <name>3C048/1/TO</name>
+                  <description>3C048/1/TO (Target Observation)</description>
+                  <topology>B0.1.T</topology>
+                  <predecessor_topology>B0.1.C</predecessor_topology>
+                  <currentStatus>
+                    <mom2:openedStatus/>
+                  </currentStatus>
+                  <lofar:observationAttributes>
+                    <observationId>
+                    </observationId>
+                    <name>3C048/1/TO</name>
+                    <projectName>SDF-PPE</projectName>
+                    <instrument>Beam Observation</instrument>
+                    <defaultTemplate>BeamObservation</defaultTemplate>
+                    <tbbPiggybackAllowed>true</tbbPiggybackAllowed>
+                    <aartfaacPiggybackAllowed>true</aartfaacPiggybackAllowed>
+                    <userSpecification>
+                      <correlatedData>true</correlatedData>
+                      <coherentStokesData>false</coherentStokesData>
+                      <incoherentStokesData>false</incoherentStokesData>
+                      <antenna>LBA Outer</antenna>
+                      <clock mode="200 MHz"/>
+                      <instrumentFilter>30-90 MHz</instrumentFilter>
+                      <integrationInterval>1.0</integrationInterval>
+                      <channelsPerSubband>64</channelsPerSubband>
+                      <coherentDedisperseChannels>false</coherentDedisperseChannels>
+                      <tiedArrayBeams>
+                        <flyseye>false</flyseye>
+                      </tiedArrayBeams>
+                      <stokes>
+                        <integrateChannels>false</integrateChannels>
+                        <subbandsPerFileCS>512</subbandsPerFileCS>
+                        <numberCollapsedChannelsCS>16</numberCollapsedChannelsCS>
+                        <stokesDownsamplingStepsCS>128</stokesDownsamplingStepsCS>
+                        <whichCS>IQUV</whichCS>
+                        <subbandsPerFileIS></subbandsPerFileIS>
+                        <numberCollapsedChannelsIS></numberCollapsedChannelsIS>
+                        <stokesDownsamplingStepsIS></stokesDownsamplingStepsIS>
+                        <whichIS></whichIS>
+                      </stokes>
+                      <stationSet>Custom</stationSet>
+                      <stations>CS001,CS002,CS003,CS004,CS005,CS006,CS007,CS011,CS013,CS017,CS021,CS024,CS026,CS028,CS030,CS031,CS032,CS101,CS103,CS201,CS301,CS302,CS401,CS501,DE601,DE602,DE603,DE604,DE605,DE609,FR606,IE613,PL610,PL611,PL612,RS106,RS205,RS208,RS210,RS305,RS306,RS307,RS310,RS406,RS407,RS409,RS503,RS508,RS509,SE607,UK608</stations>
+                      <timeFrame>UT</timeFrame>
+                      <startTime>2019-03-05T17:01:00</startTime>
+                      <endTime>2019-03-05T21:01:00</endTime>
+                      <duration>14400</duration>
+                      <bypassPff>false</bypassPff>
+                      <enableSuperterp>false</enableSuperterp>
+                      <numberOfBitsPerSample>8</numberOfBitsPerSample>
+                    </userSpecification>
+                  </lofar:observationAttributes>
+                  <children>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>3C048</name>
+                        <description>3C048</description>
+                        <topology>B0.1.T.SAP000</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Target</measurementType>
+                          <specification>
+                            <targetName>3C048</targetName>
+                            <ra>24.4220833333</ra>
+                            <dec>33.1597594444</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>154..397</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings>0</nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.T.SAP000.uv.dps</name>
+                    <topology>B0.1.T.SAP000.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>W3</name>
+                        <description>W3</description>
+                        <topology>B0.1.T.SAP001</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Target</measurementType>
+                          <specification>
+                            <targetName>W3</targetName>
+                            <ra>36.7670833333</ra>
+                            <dec>61.8741944444</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>154..397</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings>0</nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.T.SAP001.uv.dps</name>
+                    <topology>B0.1.T.SAP001.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+<item index="0">
+                      <lofar:measurement xsi:type="lofar:BFMeasurementType">
+                        <name>3C196</name>
+                        <description>3C196</description>
+                        <topology>B0.1.T.SAP002</topology>
+                        <currentStatus>
+                          <mom2:openedStatus/>
+                        </currentStatus>
+                        <lofar:bfMeasurementAttributes>
+                          <measurementType>Calibration</measurementType>
+                          <specification>
+                            <targetName>3C196</targetName>
+                            <ra>123.400291667</ra>
+                            <dec>48.2173611111</dec>
+                            <equinox>J2000</equinox>
+                            <duration>0</duration>
+                            <subbandsSpecification>
+                              <subbands>154..397</subbands>
+                            </subbandsSpecification>
+                          <tiedArrayBeams>
+                            <flyseye>false</flyseye>
+                          <nrTabRings></nrTabRings>
+                          <tabRingSize></tabRingSize>
+                            <tiedArrayBeamList>
+                              
+                            </tiedArrayBeamList>
+                          </tiedArrayBeams>
+                          </specification>
+                        </lofar:bfMeasurementAttributes>
+                        <resultDataProducts>
+                                          <item>
+                    <lofar:uvDataProduct>
+                    <name>B0.1.T.SAP002.uv.dps</name>
+                    <topology>B0.1.T.SAP002.uv.dps</topology>
+                    <status>no_data</status>
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                        </resultDataProducts>
+                      </lofar:measurement>
+                    </item>
+</children>
+                </lofar:observation>
+                </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.CPCP</topology>
+                <predecessor_topology>B0.1.C</predecessor_topology>
+                <name>3C196/1/CPCP</name>
+                <description>3C196/1/CPCP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>LBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>2</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget></ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.T.SAP002.uv.dps.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.CPCP.uv.dps</name>
+                      <topology>B0.1.CPCP.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                <topology>B0.1.CPT</topology>
+                <predecessor_topology>B0.1.CPCP</predecessor_topology>
+                <name>3C196/1/CPT</name>
+                <description>3C196/1/CPT (Cal Pipe Target)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>MSSS target pre-processing</defaultTemplate>
+                  <flaggingStrategy>LBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <skyModelDatabase>3C196</skyModelDatabase>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>2</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways></demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget></ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable>true</beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.CPCP.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:instrumentModelDataProduct>
+                      <name>B0.1.CPT.inst.dps</name>
+                      <topology>B0.1.CPT.inst.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:instrumentModelDataProduct>
+                  </item>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.CPT.uv.dps</name>
+                      <topology>B0.1.CPT.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.PPT0</topology>
+                <predecessor_topology>B0.1.T</predecessor_topology>
+                <name>3C048/1.0/TPP</name>
+                <description>3C048/1.0/TPP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>LBAdefault</flaggingStrategy>
+                  <duration>600</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways>CasA,CygA</demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>true</ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.T.SAP000.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.PPT0.uv.dps</name>
+                      <topology>B0.1.PPT0.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+<item index="0">
+                  <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                    <topology>B0.1.PT0</topology>
+                    <predecessor_topology>B0.1.PPT0,B0.1.CPC</predecessor_topology>
+                    <name>3C048/1.0/TP</name>
+                    <description>3C048/1.0/TP (Target Pipeline)</description>
+                    <currentStatus>
+                      <mom2:openedStatus/>
+                    </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                    <pipelineAttributes>
+                      <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
+                      <flaggingStrategy>LBAdefault</flaggingStrategy>
+                      <duration>600</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways>CasA,CygA</demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>true</ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable>true</beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                    <usedDataProducts>
+                      <item>
+                        <lofar:uvDataProduct topology="B0.1.PPT0.uv.dps">
+                          <name>B0.1.PPT0.uv.dps</name>
+                        </lofar:uvDataProduct>
+                      </item>
+                      <item>
+                        <lofar:instrumentModelDataProduct topology="B0.1.CPT.inst.dps">
+                          <name>B0.1.CPT.inst.dps</name>
+                        </lofar:instrumentModelDataProduct>
+                      </item>
+                    </usedDataProducts>
+                    <resultDataProducts>
+                        <item>
+                          <lofar:uvDataProduct>
+                            <name>B0.1.PT0.uv.dps</name>
+                            <topology>B0.1.PT0.uv.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:uvDataProduct>
+                        </item>
+                                                <item>
+                          <lofar:instrumentModelDataProduct>
+                            <name>B0.1.PT0.inst.dps</name>
+                            <topology>B0.1.PT0.inst.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:instrumentModelDataProduct>
+                        </item>
+                    </resultDataProducts>
+                    </lofar:pipeline>
+                  </item>
+        <item index="0">
+              <lofar:pipeline xsi:type="lofar:AveragingPipelineType">
+                <topology>B0.1.PPT1</topology>
+                <predecessor_topology>B0.1.T</predecessor_topology>
+                <name>W3/1.1/TPP</name>
+                <description>W3/1.1/TPP (Preprocessing)</description>
+                <currentStatus>
+                  <mom2:openedStatus/>
+                </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <pipelineAttributes>
+                  <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
+                  <flaggingStrategy>LBAdefault</flaggingStrategy>
+                  <duration>14400</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways>CasA,CygA</demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>true</ignoreTarget>
+                  </demixingParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                <usedDataProducts>
+                  <item>
+                    <lofar:uvDataProduct topology="B0.1.T.SAP001.uv.dps">
+                    </lofar:uvDataProduct>
+                  </item>
+                </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:uvDataProduct>
+                      <name>B0.1.PPT1.uv.dps</name>
+                      <topology>B0.1.PPT1.uv.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:uvDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+<item index="0">
+                  <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                    <topology>B0.1.PT1</topology>
+                    <predecessor_topology>B0.1.PPT1,B0.1.CPC</predecessor_topology>
+                    <name>W3/1.1/TP</name>
+                    <description>W3/1.1/TP (Target Pipeline)</description>
+                    <currentStatus>
+                      <mom2:openedStatus/>
+                    </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                    <pipelineAttributes>
+                      <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
+                      <flaggingStrategy>LBAdefault</flaggingStrategy>
+                      <duration>14400</duration>
+                  <demixingParameters>
+                    <averagingFreqStep>4</averagingFreqStep>
+                    <averagingTimeStep>1</averagingTimeStep>
+                    <demixFreqStep>64</demixFreqStep>
+                    <demixTimeStep>10</demixTimeStep>
+                    <demixAlways>CasA,CygA</demixAlways>
+                    <demixIfNeeded></demixIfNeeded>
+                    <ignoreTarget>true</ignoreTarget>
+                  </demixingParameters>
+            <bbsParameters>
+              <baselines></baselines>
+              <correlations></correlations>
+              <beamModelEnable>true</beamModelEnable>
+              <solveParms></solveParms>
+              <solveUVRange></solveUVRange>
+              <strategyBaselines></strategyBaselines>
+              <strategyTimeRange></strategyTimeRange>
+            </bbsParameters>
+<misc>{"storagemanager": ""}</misc>
+</pipelineAttributes>
+                    <usedDataProducts>
+                      <item>
+                        <lofar:uvDataProduct topology="B0.1.PPT1.uv.dps">
+                          <name>B0.1.PPT1.uv.dps</name>
+                        </lofar:uvDataProduct>
+                      </item>
+                      <item>
+                        <lofar:instrumentModelDataProduct topology="B0.1.CPT.inst.dps">
+                          <name>B0.1.CPT.inst.dps</name>
+                        </lofar:instrumentModelDataProduct>
+                      </item>
+                    </usedDataProducts>
+                    <resultDataProducts>
+                        <item>
+                          <lofar:uvDataProduct>
+                            <name>B0.1.PT1.uv.dps</name>
+                            <topology>B0.1.PT1.uv.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:uvDataProduct>
+                        </item>
+                                                <item>
+                          <lofar:instrumentModelDataProduct>
+                            <name>B0.1.PT1.inst.dps</name>
+                            <topology>B0.1.PT1.inst.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                          </lofar:instrumentModelDataProduct>
+                        </item>
+                    </resultDataProducts>
+                    </lofar:pipeline>
+                  </item>
+<item index="0">
+        <lofar:pipeline xsi:type="lofar:ImagingPipelineType">
+          <topology>B0.PI0</topology>
+          <predecessor_topology>B0.1.PT0</predecessor_topology>
+          <name>3C048/IM</name>
+          <description>3C048/IM (Imaging pipeline beam 0)</description>
+          <currentStatus>
+            <mom2:openedStatus/>
+          </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <imagingPipelineAttributes>
+            <defaultTemplate>Imaging Pipeline LBA</defaultTemplate>
+            <duration>0</duration>
+            <nrOfOutputSkyImage>244</nrOfOutputSkyImage>
+            <imagingParameters>
+              <nrSlicesPerImage>1</nrSlicesPerImage>
+              <nrSubbandsPerImage>1</nrSubbandsPerImage>
+              <maxBaseline></maxBaseline>
+              <fieldOfView></fieldOfView>
+              <weight></weight>
+              <robust></robust>
+              <iterations></iterations>
+              <threshold></threshold>
+              <uvMin></uvMin>
+              <uvMax></uvMax>
+              <stokes></stokes>
+            </imagingParameters>
+
+          </imagingPipelineAttributes>
+                <usedDataProducts>
+                <item>
+              <lofar:uvDataProduct topology="B0.1.PT0.uv.dps">
+                <name>B0.1.PT0.uv.dps</name>
+              </lofar:uvDataProduct>
+            </item>
+               </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:skyImageDataProduct>
+                      <name>B0.PI0.sky.dps</name>
+                      <topology>B0.PI0.sky.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:skyImageDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+<item index="0">
+        <lofar:pipeline xsi:type="lofar:ImagingPipelineType">
+          <topology>B0.PI1</topology>
+          <predecessor_topology>B0.1.PT1</predecessor_topology>
+          <name>W3/IM</name>
+          <description>W3/IM (Imaging pipeline beam 1)</description>
+          <currentStatus>
+            <mom2:openedStatus/>
+          </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>122</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>
+                    <maxDurationPerTask>P7DT0S</maxDurationPerTask>
+                    <numberOfCoresPerTask>2</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <imagingPipelineAttributes>
+            <defaultTemplate>Imaging Pipeline LBA</defaultTemplate>
+            <duration>0</duration>
+            <nrOfOutputSkyImage>244</nrOfOutputSkyImage>
+            <imagingParameters>
+              <nrSlicesPerImage>1</nrSlicesPerImage>
+              <nrSubbandsPerImage>1</nrSubbandsPerImage>
+              <maxBaseline></maxBaseline>
+              <fieldOfView></fieldOfView>
+              <weight></weight>
+              <robust></robust>
+              <iterations></iterations>
+              <threshold></threshold>
+              <uvMin></uvMin>
+              <uvMax></uvMax>
+              <stokes></stokes>
+            </imagingParameters>
+
+          </imagingPipelineAttributes>
+                <usedDataProducts>
+                <item>
+              <lofar:uvDataProduct topology="B0.1.PT1.uv.dps">
+                <name>B0.1.PT1.uv.dps</name>
+              </lofar:uvDataProduct>
+            </item>
+               </usedDataProducts>
+                <resultDataProducts>
+                  <item>
+                    <lofar:skyImageDataProduct>
+                      <name>B0.PI1.sky.dps</name>
+                      <topology>B0.PI1.sky.dps</topology>
+                      <status>no_data</status>
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
+                    </lofar:skyImageDataProduct>
+                  </item>
+                </resultDataProducts>
+              </lofar:pipeline>
+            </item>
+</children>
+  </lofar:folder>
+  </item>
+</children>
+  </lofar:folder>
+  </item>
+          </children>
+  </lofar:project>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/prefactor.xml b/SAS/XML_generator/test/test_regression.in_data/xml/prefactor.xml
index 4033e85829df48b51f53965c91e1506f5c062d80..83df16bf9aa10ddb86956f01e9d96c0d1779f6c1 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/prefactor.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/prefactor.xml
@@ -193,7 +193,7 @@
                     <runSimultaneous>true</runSimultaneous>
                   </processingCluster>
                 <pipelineAttributes>
-                  <defaultTemplate>Calibration Pipeline</defaultTemplate>
+                  <defaultTemplate>MSSS target pre-processing</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
                   <duration>43200</duration>
                   <skyModelDatabase>3C380</skyModelDatabase>
@@ -405,15 +405,15 @@
                 </resultDataProducts>
               </lofar:pipeline>
             </item>
-        <item index="0">
-              <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
-                <topology>B0.1.PT0</topology>
-                <predecessor_topology>B0.1.CPTP,B0.1.CPC</predecessor_topology>
-                <name>HD156279/1.0/TP</name>
-                <description>HD156279/1.0/TP (Target Pipeline)</description>
-                <currentStatus>
-                  <mom2:openedStatus/>
-                </currentStatus>
+<item index="0">
+                  <lofar:pipeline xsi:type="lofar:CalibrationPipelineType">
+                    <topology>B0.1.PT0</topology>
+                    <predecessor_topology>B0.1.PPT0,B0.1.CPC</predecessor_topology>
+                    <name>HD156279/1.0/TP</name>
+                    <description>HD156279/1.0/TP (Target Pipeline)</description>
+                    <currentStatus>
+                      <mom2:openedStatus/>
+                    </currentStatus>
   <processingCluster>
                     <name>CEP4</name>
                     <partition>cpu</partition>
@@ -424,11 +424,10 @@
                     <numberOfCoresPerTask>2</numberOfCoresPerTask>
                     <runSimultaneous>true</runSimultaneous>
                   </processingCluster>
-                <pipelineAttributes>
-                  <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
-                  <flaggingStrategy>LBAdefault</flaggingStrategy>
-                  <duration>43200</duration>
-                  <skyModelDatabase>3C380</skyModelDatabase>
+                    <pipelineAttributes>
+                      <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
+                      <flaggingStrategy>LBAdefault</flaggingStrategy>
+                      <duration>43200</duration>
                   <demixingParameters>
                     <averagingFreqStep>8</averagingFreqStep>
                     <averagingTimeStep>1</averagingTimeStep>
@@ -449,38 +448,44 @@
             </bbsParameters>
 <misc>{"storagemanager": "dysco"}</misc>
 </pipelineAttributes>
-                <usedDataProducts>
-                  <item>
-                    <lofar:uvDataProduct topology="B0.1.PPT0.uv.dps">
-                    </lofar:uvDataProduct>
-                  </item>
-                </usedDataProducts>
-                <resultDataProducts>
-                  <item>
-                    <lofar:instrumentModelDataProduct>
-                      <name>B0.1.PT0.inst.dps</name>
-                      <topology>B0.1.PT0.inst.dps</topology>
-                      <status>no_data</status>
-                      <storageCluster>
+                    <usedDataProducts>
+                      <item>
+                        <lofar:uvDataProduct topology="B0.1.PPT0.uv.dps">
+                          <name>B0.1.PPT0.uv.dps</name>
+                        </lofar:uvDataProduct>
+                      </item>
+                      <item>
+                        <lofar:instrumentModelDataProduct topology="B0.1.CPC.inst.dps">
+                          <name>B0.1.CPC.inst.dps</name>
+                        </lofar:instrumentModelDataProduct>
+                      </item>
+                    </usedDataProducts>
+                    <resultDataProducts>
+                        <item>
+                          <lofar:uvDataProduct>
+                            <name>B0.1.PT0.uv.dps</name>
+                            <topology>B0.1.PT0.uv.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
                       <name>CEP4</name>
                       <partition>/data/projects/</partition>
                     </storageCluster>
-                    </lofar:instrumentModelDataProduct>
-                  </item>
-                  <item>
-                    <lofar:uvDataProduct>
-                      <name>B0.1.PT0.uv.dps</name>
-                      <topology>B0.1.PT0.uv.dps</topology>
-                      <status>no_data</status>
-                      <storageCluster>
+                          </lofar:uvDataProduct>
+                        </item>
+                                                <item>
+                          <lofar:instrumentModelDataProduct>
+                            <name>B0.1.PT0.inst.dps</name>
+                            <topology>B0.1.PT0.inst.dps</topology>
+                            <status>no_data</status>
+                            <storageCluster>
                       <name>CEP4</name>
                       <partition>/data/projects/</partition>
                     </storageCluster>
-                    </lofar:uvDataProduct>
+                          </lofar:instrumentModelDataProduct>
+                        </item>
+                    </resultDataProducts>
+                    </lofar:pipeline>
                   </item>
-                </resultDataProducts>
-              </lofar:pipeline>
-            </item>
 <item index="0">
         <lofar:pipeline xsi:type="lofar:ImagingPipelineType">
           <topology>B0.PI0</topology>
@@ -529,8 +534,8 @@
                 <resultDataProducts>
                   <item>
                     <lofar:skyImageDataProduct>
-                      <name>B0.PI0.dps</name>
-                      <topology>B0.PI0.dps</topology>
+                      <name>B0.PI0.sky.dps</name>
+                      <topology>B0.PI0.sky.dps</topology>
                       <status>no_data</status>
                       <storageCluster>
                       <name>CEP4</name>