diff --git a/CEP/DP3/DPPP/include/DPPP/ApplyCal.h b/CEP/DP3/DPPP/include/DPPP/ApplyCal.h
index b827eaa81d45d260d05328791932e9485fd2cc1a..73252a864c882de9da5c0c94eb69b118dafdce0b 100644
--- a/CEP/DP3/DPPP/include/DPPP/ApplyCal.h
+++ b/CEP/DP3/DPPP/include/DPPP/ApplyCal.h
@@ -85,6 +85,14 @@ namespace LOFAR {
                              uint bl, uint chan, bool updateWeights,
                              FlagCounter& flagCounter);
 
+      // Apply a diagonal Jones matrix to the 2x2 visibilities matrix: A.V.B^H,
+      // where the solution is equal for both polarizations
+      static void applyScalar(const casa::DComplex* gainA,
+                              const casa::DComplex* gainB,
+                              casa::Complex* vis, float* weight, bool* flag,
+                              uint bl, uint chan, bool updateWeights,
+                              FlagCounter& flagCounter);
+
       // Apply a full Jones matrix to the 2x2 visibilities matrix: A.V.B^H
       static void applyFull (const casa::DComplex* gainA,
                              const casa::DComplex* gainB,
diff --git a/CEP/DP3/DPPP/include/DPPP/GainCal.h b/CEP/DP3/DPPP/include/DPPP/GainCal.h
index 7b9a4a179f0448beef39095548746b519a438262..6821c235dfd05a527916aad7ecd7c6e57013f2b5 100644
--- a/CEP/DP3/DPPP/include/DPPP/GainCal.h
+++ b/CEP/DP3/DPPP/include/DPPP/GainCal.h
@@ -89,6 +89,9 @@ namespace LOFAR {
       // Perform stefcal (polarized or unpolarized)
       void stefcal();
 
+      // Check for scalar mode
+      bool scalarMode();
+
       // Apply the solution
       void applySolution(DPBuffer& buf, const casa::Cube<casa::DComplex>& invsol);
 
diff --git a/CEP/DP3/DPPP/src/ApplyCal.cc b/CEP/DP3/DPPP/src/ApplyCal.cc
index ecbe7168017de3565e162096189189926d9fe0bf..456a58fa935484541a6b27e57d5b951d9d36625d 100644
--- a/CEP/DP3/DPPP/src/ApplyCal.cc
+++ b/CEP/DP3/DPPP/src/ApplyCal.cc
@@ -554,6 +554,37 @@ namespace LOFAR {
       }
     }
 
+    void ApplyCal::applyScalar(const DComplex* gainA, const DComplex* gainB,
+                              Complex* vis, float* weight, bool* flag,
+                              uint bl, uint chan, bool updateWeights,
+                              FlagCounter& flagCounter) {
+      // If parameter is NaN or inf, do not apply anything and flag the data
+      if (! (isFinite(gainA[0].real()) && isFinite(gainA[0].imag()) &&
+             isFinite(gainB[0].real()) && isFinite(gainB[0].imag())) ) {
+        // Only update flagcounter for first correlation
+        if (!flag[0]) {
+          flagCounter.incrChannel(chan);
+          flagCounter.incrBaseline(bl);
+        }
+        for (uint corr=0; corr<4; ++corr) {
+          flag[corr]=true;
+        }
+        return;
+      }
+
+      vis[0] *= gainA[0] * conj(gainB[0]);
+      vis[1] *= gainA[0] * conj(gainB[0]);
+      vis[2] *= gainA[0] * conj(gainB[0]);
+      vis[3] *= gainA[0] * conj(gainB[0]);
+
+      if (updateWeights) {
+        weight[0] /= norm(gainA[0]) * norm(gainB[0]);
+        weight[1] /= norm(gainA[0]) * norm(gainB[0]);
+        weight[2] /= norm(gainA[0]) * norm(gainB[0]);
+        weight[3] /= norm(gainA[0]) * norm(gainB[0]);
+      }
+    }
+
     // Inverts complex 2x2 input matrix
     void ApplyCal::invert (DComplex* v, double sigmaMMSE)
     {
diff --git a/CEP/DP3/DPPP/src/GainCal.cc b/CEP/DP3/DPPP/src/GainCal.cc
index 5f8552ea663e81f340138522e19897fd48671dc6..a43e31dee2ebfb1d6d7c283667e264a0b26694dc 100644
--- a/CEP/DP3/DPPP/src/GainCal.cc
+++ b/CEP/DP3/DPPP/src/GainCal.cc
@@ -428,7 +428,14 @@ namespace LOFAR {
                        &flag[  bl * 4 * nchan + chan * 4 ],
                        bl, chan, false, itsFlagCounter); // Update weights is disabled here
           }
-          else {
+          else if (scalarMode()) {
+            ApplyCal::applyScalar( &invsol(0, antA, freqCell),
+                       &invsol(0, antB, freqCell),
+                       &data[bl * 4 * nchan + chan * 4 ],
+                       &weight[bl * 4 * nchan + chan * 4 ], // Not passing weights, any pointer should do
+                       &flag[  bl * 4 * nchan + chan * 4 ],
+                       bl, chan, false, itsFlagCounter); // Update weights is disabled here
+          } else {
             ApplyCal::applyDiag( &invsol(0, antA, freqCell),
                        &invsol(0, antB, freqCell),
                        &data[bl * 4 * nchan + chan * 4 ],
@@ -487,6 +494,11 @@ namespace LOFAR {
       }
     }
 
+    bool GainCal::scalarMode() {
+      return (itsMode=="tecandphase" || itsMode=="tec" || itsMode=="scalarphase" || 
+              itsMode=="scalaramplitude");
+    }
+
     void GainCal::stefcal () {
       itsTimerSolve.start();
 
@@ -848,12 +860,10 @@ namespace LOFAR {
           continue;
         }
         for (int pol=0; pol<4; ++pol) { // For 0101
-          if ((itsMode=="diagonal" || itsMode=="phaseonly" ||
-               itsMode=="amplitudeonly") && (pol==1||pol==2)) {
+          if (scalarMode() && pol>0) {
             continue;
-          }
-          if ((itsMode=="scalarphase" || itsMode=="scalaramplitude" ||
-              itsMode=="tec" || itsMode=="tecandphase") && pol>0) {
+          } else if ((itsMode=="diagonal" || itsMode=="phaseonly" ||
+                      itsMode=="amplitudeonly") && (pol==1||pol==2)) {
             continue;
           }
           int realimmax; // For tecandphase, this functions as dummy between tec and commonscalarphase
diff --git a/CMake/LofarMacros.cmake b/CMake/LofarMacros.cmake
index e665906bcff3e4b94595387eeeed0cad23635f01..7995cc094c79f6ee0607e7df796869b1224f2767 100644
--- a/CMake/LofarMacros.cmake
+++ b/CMake/LofarMacros.cmake
@@ -8,6 +8,7 @@
 #   lofar_add_sbin_program(name)
 #   lofar_add_sbin_scripts([name1 [name2 ..]])
 #   lofar_add_sysconf_files([name1 [name2 ..]])
+#   lofar_add_data_files([name1 [name2 ..]])
 #   lofar_add_test(name)
 #   lofar_create_target_symlink(target symlink)
 #   lofar_join_arguments(var)
@@ -196,6 +197,26 @@ if(NOT DEFINED LOFAR_MACROS_INCLUDED)
   endmacro(lofar_add_sysconf_files)
 
 
+  # --------------------------------------------------------------------------
+  # lofar_add_data_files([name1 [name2 ..]])
+  #
+  # Add system data files (architecture-independent data) that need to be
+  # installed into the <prefix>/share directory. Also create a symbolic link
+  # in <build-dir>/share to each of these files. The file names may contain
+  # a relative(!) path.
+  # --------------------------------------------------------------------------
+  macro(lofar_add_data_files)
+    foreach(_name ${ARGN})
+      get_filename_component(_path ${_name} PATH)
+      get_filename_component(_abs_name ${_name} ABSOLUTE)
+      file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/share/${_path})
+      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+        ${_abs_name} ${CMAKE_BINARY_DIR}/share/${_name})
+      install(FILES ${_name} DESTINATION share/${_path})
+    endforeach(_name ${ARGN})
+  endmacro(lofar_add_data_files)
+
+
   # --------------------------------------------------------------------------
   # lofar_add_test(name [source ...] [DEPENDS depend ...])
   #
diff --git a/LCS/MessageDaemons/webmonitor/QPIDWebserverJSON b/LCS/MessageDaemons/webmonitor/QPIDWebserverJSON
index 9941a805959becf5c7b8bdfa9f722f100b606314..a8f7bda6ecda29892d6866097e97ba878c39cc8d 100644
--- a/LCS/MessageDaemons/webmonitor/QPIDWebserverJSON
+++ b/LCS/MessageDaemons/webmonitor/QPIDWebserverJSON
@@ -37,7 +37,11 @@ class perpetualTimer:
 
 brokerlist= []
 
-if MyHostname.lower() != 'ccu099' :
+#This should be done with
+#from lofar.common import isProductionEnvironment, isTestEnvironment
+#But lofar.common is not installed on ccu001.
+
+if MyHostname.lower() == 'ccu001' :
    brokerlist = [ "amqp://CCU001","amqp://sas001","amqp://lcs023","amqp://cbm001","amqp://cbm002","amqp://cbm003","amqp://cbm004","amqp://cbm005","amqp://cbm006","amqp://cbm007","amqp://cbm008","amqp://mcu001"]
    for i in range(1,49):
       nodename = 'amqp://cpu%(#)02d.cep4.control.lofar' % {"#": i}
diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py
index 96f2c784599a574d2946d16003237b04637c1fa4..c8c00287f6718825c735db5c3ae8b769a908d3d9 100755
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py
@@ -247,7 +247,7 @@ class LtaCp:
             # data is written to fifo, which is then later fed into globus-url-copy
             # on stdout we can monitor progress
             # set progress message step 0f 0.5% of estimated_tar_size
-            cmd_md5a32bc = ['md5a32bc', '-p', str(estimated_tar_size/200), self.local_data_fifo]
+            cmd_md5a32bc = ['md5a32bc', '-p', str(min(100000000, estimated_tar_size/200)), self.local_data_fifo]
             logger.info('ltacp %s: processing data stream for md5, adler32 and byte_count. executing: %s' % (self.logId, ' '.join(cmd_md5a32bc),))
             p_md5a32bc = Popen(cmd_md5a32bc, stdin=p_data_in.stdout, stdout=PIPE, stderr=PIPE, universal_newlines=True)
             self.started_procs[p_md5a32bc] = cmd_md5a32bc
diff --git a/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA.pnl b/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA.pnl
index 98a9a3659b4436d1647e17d291769345bfddf633..30cdd592f70beb43c27c43d1e52285df82296bbe 100644
--- a/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA.pnl
+++ b/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA.pnl
@@ -1,3381 +1,55 @@
 V 13
-4
-LANG:1 8 AEScreen
-LANG:10000 8 AESchirm
-LANG:10001 8 AEScreen
-LANG:10027 45 Панель алармов и событий
-PANEL,-1 -1 1060 793 N "_3DFace" 3
-"$ACTION"
-"$FILENAME"
-"$SCREENTYPE"
-"main()
-{
-  if ( isDollarDefined(\"$SCREENTYPE\") )
-    sDummyStringForDollarParameter1 = $SCREENTYPE;
-  if ( isDollarDefined(\"$ACTION\") )
-    sDummyStringForDollarParameter2 = $ACTION;
-  if ( isDollarDefined(\"$FILENAME\") )
-    sDummyStringForDollarParameter3 = $FILENAME;
-  
-  g_regInitReady=AES_INITSTATE_WAITING;
-  
-  dpGetCache(\"_Config.TimeoutJumping:_online.._value\", g_uJumpingTimeout);
-}
-" 0
- E E E E 1 -1 -1 0  68 1230
+1
+LANG:1 0 
+PANEL,-1 -1 1078 735 N "_3DFace" 0
+E E E E E 1 -1 -1 0  -350 1100
 ""0  1
-E "#uses \"aec.ctl\"
-#uses \"aes.ctl\"
-#uses \"aesuser.ctl\"
-//#uses \"dpGroups.ctl\"
-/////// neuer Teil - nicht loeschen
-///////////////////////////////////
-
-bool g_bTableLineSynchronisation;
-unsigned g_uJumpingTimeout;
-
-int g_iLineHoldThreadTop = -2;
-int g_iLineHoldThreaBot = -2;
-
-bool g_initFromAES;
-dyn_anytype vst;
-dyn_anytype vstn;
-bool g_langSwitched=false;
-int g_lsActiveRegister;
-string g_lsActiveScreenConfig;
-int g_lsProportion;
-
-bool g_firstHL=true;
-int g_arHeight=1;
-
-// flag for table init - wait for start operation
-bool g_regGeneralInit=false;
-
-bool p_startAction=false;
-string p_screenConfig;
-int p_action;
-string p_fileName;
-bool p_dispSlider=true;
-
-const bool g_autoAction=true;   // flag for automatic run
-const bool g_alertRow=false;    // flag to indicate alert row mode
-
-// neu
-dyn_anytype ddaRes;
-dyn_dyn_anytype vstn;   // new vst for AESCREEN => not global
-
-dyn_string      g_visibleColumnsTop;// da die sichtbaren Spalten auch die Reihenfolge im AS bestimmen
-dyn_string      g_visibleColumnsBot;// da die sichtbaren Spalten auch die Reihenfolge im AS bestimmen
-
-// speichert die letzte selektierte  registerkarte
-// wird in regChanged event beruecksichtigt um config und configList der
-// registerkarten top/bot mit general zu synchronisieren !!!
-// ACHTUNG - bei querystart muss immer die konfiguration der activen registerkarte verwendet werden !!!!!!
-// init mit 2 => entspricht reg_general
-unsigned g_lastActiveRegister=AESREGTAB_GENERAL;
-// header names for register tabs
-dyn_string g_regHeaderNames;
-
-// reg init statusinformation - important for table init routine ( _propDP check )
-int g_regInitReady=AES_INITSTATE_WAITING;
-
-// panel global propDP names ( _AESProperties )
-string g_propDpNameTop;   // name changed from gp_propDpName
-string g_propDpNameBot;
-
-// keeps the menuinformation
-dyn_dyn_anytype g_ddam;
-
-// global variables for shape information ( for top and bottom table )
-shape g_top;
-shape g_bottom;
-// §§§ alle panelglobalen mit gp !!!!!!!! damit kein konflikt mit scriptglobalen !!!!!
-
-/////// neuer Teil - nicht loeschen / end
-/////////////////////////////////////////
-
-int firstAlertMenu, lastAlertMenu;
-int firstEventMenu, lastEventMenu;
-int firstAlertRowMenu, lastAlertRowMenu;
-//****************************
-// from as/es_init() ****begin
-
-////// alerts
-//***********
-int AS_HIST_RANGE_SEC = 3600*24;
-int E_AS_FUNCTION = 0;
-int E_AS_DP_VAL = 1;
-dyn_string AS_TYPEFILTER;   // init in aes_initMainReg()
-dyn_int AS_TYPECONST;
-
-////// events
-//***********
-int ES_HIST_RANGE_SEC = 3600*24;
-int E_ES_FUNCTION = 0;
-int E_ES_DP_VAL = 1;
-dyn_string ES_TYPEFILTER;  // init in aes_initMainReg()
-dyn_int ES_TYPECONST;
-
-// §§§ ACHTUNG jetzt noch as - in zukunft aes oder ohne prefix !!!!!!!!!!!!!!!!
-// init ==> see aes_initOldScreenVariables() / initRegMain()
-int g_asMaxLinesToDisplay=0;
-int g_asMaxDpeToDisplay=0;
-int g_asMaxDpeHourToDisplay=0;
-
-// sync flags for reggeneralinit
-bool g_ctrlFlagTop=false;
-bool g_ctrlFlagBot=false;
-
-// global variables for splitscreen treating
-int  g_percent=50;
-int  g_splitMax=100;
-int  g_splitMin=0;
-int  g_splitInc=10;
-bool g_splitInit=false;
-int  g_percent;
-int  g_snap=4;
-
-int   g_both_x;
-float g_both_w;
-
-int   g_top_y;
-float g_total_h;
-
-string sDummyStringForDollarParameter1;// = $SCREENTYPE;
-string sDummyStringForDollarParameter2;// = $ACTION;
-string sDummyStringForDollarParameter3;// = $FILENAME;
-
-aes_scrollHandling(int tabType, int &iLineHoldThread)
-{
-  int propMode;
-  string propDpName;
- 
-  if(g_uJumpingTimeout == 0)
-    return;
-  
-  propDpName = aes_getPropDpName(AES_DPTYPE_PROPERTIES, true, tabType);
-  aes_getPropMode(propDpName, propMode);
-  
-  if(iLineHoldThread == -2)
-  {
-    iLineHoldThread = -1;
-    return;
-  }
-  
-  if(iLineHoldThread != -1)
-  {
-    stopThread(iLineHoldThread);
-    iLineHoldThread = -1;
-  }
-  
-  if(propMode != AES_MODE_CLOSED)
-    iLineHoldThread = startThread(\"aes_lineHoldTimeoutThread\", tabType);
-}
-
-aes_lineHoldTimeoutThread(int tabType)
-{
-  do
-  {
-    delay(g_uJumpingTimeout);
-  } while( ((tabType == AESTAB_TOP) && table_top.isVerticalSliderPressed()) ||
-           ((tabType == AESTAB_BOT) && table_bot.isVerticalSliderPressed()) );
-
-  if(tabType == AESTAB_TOP)
-    g_iLineHoldThreadTop = -2;
-  else
-    g_iLineHoldThreadBot = -2;
-  
-  this.lineVisible = -1;
-}
-
-
-
-
-
-
-" 0
- 4
+E E 3
 "CBRef" "1"
 "EClose" E
-"ELangChanged" "main()
-{
-  int areg;
-  string sconfig;
-
-  g_langSwitched=true;
-  
-  areg=reg_main.activeRegister;
-  sconfig=cb_aesConfig.selectedText;
-
-  reg_main.visible=false;
-  table_top.visible=false;
-  table_bot.visible=false;
-
-  if( sconfig == \"\" )
-    sconfig=cb_aesConfig.text;
-
-  g_lsActiveRegister=areg;
-  g_lsActiveScreenConfig=sconfig;
-  g_lsProportion=g_percent;
-
-}"
 "dpi" "96"
 0 0 0
 ""
-NC
 DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
 LAYER, 0 
 1
-LANG:1 6 Layer1
-6 26
-"DEBUG"
-""
-1 0 3 E E E 1 E 1 E N "_3DFace" E N "_3DFace" E E
- "main()
-{
-  int i;
-  for ( i=0; i<=table_top.columnCount(); i++)
-  {
-    table_top.columnVisibility(i) = TRUE;
-    table_top.columnWidth(i) = 20;
-    langString ls, ls2;
-    getValue(  \"table_top\", \"columnHeader\", i, ls); 
-    getValue(  \"table_top\", \"columnName\", i, ls2); 
-  }
-}
-" 0
- E
-22 0 0 0 0 0
-E E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-2
-"dashclr"N "_Transparent"
-"antiAliased" "0"
-E E 0 1 1 0 1 E U  1 E 0 1 3 3
-6 27
-"Border2"
-""
-1 810 630 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
- E E
-22 0 0 0 0 0
-E E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-2
-"dashclr"N "_Transparent"
-"antiAliased" "0"
-E E 0 1 1 0 1 E U  2  0 3  "27.bmp" 12632256 E 410 130 550 510
-28 0
-"reg_main"
-""
-1 9.789729781365303 -1 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
- E E
-1 0 0 0 0 0
-E E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-1
-"selchangedcb" "main()
-{
-  string config, _screenType, app, pre;
-  dyn_string configList;
-  unsigned actReg;   
-  
-  // we are using the top dp for regtab treating
-  aes_changed( g_propDpNameTop, AES_CHANGED_REGTAB );  
-}"
-4
-LANG:1 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10027 26 arial,-1,12,5,40,0,0,0,0,0
-0  9 621 1042 735
-"main()
-{
-
-  aes_initMainReg();
-  return;
-  
-  
-  if( !g_autoAction )   // if autoAction aes_initMainReg will be called from  aes_startAction
-  { 
-    aes_initMainReg();
-  }
-  else
-  {
-    // waiting for p_startAction
-    while( !p_startAction )
-    {
-      delay( 0, 300 );
-    }
-    aes_startAction( p_screenConfig, p_action );
-  }
-  
-  
-  
-  // inform tableinitroutine that reginitroutine has finished
-  // we are misusing the type table property
-
-}
-" 0
-3 "tab_top" 4
-LANG:1 2 #1
-LANG:10000 2 #1
-LANG:10001 2 #1
-LANG:10027 2 #1
-0
-"tab_bot" 4
-LANG:1 2 #2
-LANG:10000 2 #2
-LANG:10001 2 #2
-LANG:10027 2 #2
-0
-"tab_general" 4
-LANG:1 2 #3
-LANG:10000 2 #3
-LANG:10001 2 #3
-LANG:10027 2 #3
-0
-
-25 1
-"table_top"
-""
-1 9.789729781365393 -1 E E E 1 E 0 E N "_WindowText" E N "_Window" E "main(int iType)
-{
-  int tableAckAction;
-  mapping mTableMultipleRows;
-  
-//check if there is an column _ACKABLE_ otherwise it is the event screen and there is nothing to ack
-  
-  int iCnt, i;
-  iCnt=this.columnCount();
-  for (i=1; i<=iCnt; i++)
-  {
-    if (this.columnName(i) == _ACKABLE_)
-    {
-      i = iCnt+2;
-      break;
-    }
-  }
-  if (i!=iCnt+2) //_ACKABLE_ was not found
-    return;
-
-
-
-  //added support for SINGLE ACK mode to work per line instead of on whole widget
-  tableAckAction = (iType == DPATTR_ACKTYPE_SINGLE)?AES_CHANGED_ACKSINGLE:AES_CHANGED_ACKALLVIS;
-  
-  synchronized(g_bTableLineSynchronisation)
-  {
-    aes_prepareForTableAcknowledge(tableAckAction, AESTAB_TOP, mTableMultipleRows);    
-  }
-
-  aes_acknowledgeTableFunction( this.name, \"1\", mTableMultipleRows);
-}
-" 0
-
- "main(int row, string column)
-{
-  int i, j;
-  anytype value;
-  mapping mTableMultipleRows;
-  dyn_int diSelectedLines;
-  
-  //IM 116642: Trigger table widget once, to avoid timing problems
-  int top, bot;
-  getValue(\"\", \"lineRangeVisible\", top, bot);
-  
-  synchronized(g_bTableLineSynchronisation)
-  { 
-    int length;
-    dyn_anytype alertRow;  
-    
-    value=this.cellValue;
-    int iLineCnt = this.lineCount;
-    
-    dyn_string columnNames = makeDynString();
-
-
-    
-    for (j=0; j<iLineCnt; j++)
-    {
-
-      alertRow = this.getLineN(j);
-      length = dynlen(alertRow);
-      
-      if (dynlen(columnNames)==0) //read column names once
-      {
-        for (i = length; i>0; i--)
-          columnNames[i]= this.columnName(i-1);
-      }
-    
-      mapping rowHeaderMapping;
-      
-      for(i=1; i<=length; i++)
-        rowHeaderMapping[columnNames[i]] = alertRow[i];
-      
-      mTableMultipleRows[j] = rowHeaderMapping;
-    }
-    
-    diSelectedLines = this.getSelectedLines();
-  }
-
-  aes_onRightClick( g_propDpNameTop, AESTAB_TOP, this.name, row, column, value, mTableMultipleRows, diSelectedLines );
-}
-
-" 0
- "main()
-{
-  int row, column;
-  anytype value;
-  mapping mTableRow;
-  
-  synchronized(g_bTableLineSynchronisation)
-  { 
-    int length;
-    dyn_anytype alertRow;  
-        
-    // determine position 
-    getValue(\"\",\"currentCell\", row, column );
-    // and content of active cell !
-    getValue(\"\",\"cellValue\", value );
-
-    alertRow = this.getLineN(row);
-    length = dynlen(alertRow);
-    for(int i=1; i<=length; i++)
-      mTableRow[this.columnName(i-1)] = alertRow[i];
-  }
- 
-  aes_doColumnDblClick( g_propDpNameTop, row, column, value, mTableRow );
-}
-" 0
-
-2 0 0 0 0 0
-"main()
-{
-  reg_main.namedActiveRegister( AES_TABNAME_TOP );
-}" 0
- E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-1
-"scrolledCB" "synchronized main()
-{
-  aes_scrollHandling(AESTAB_TOP, g_iLineHoldThreadTop);
-}"
-4
-LANG:1 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10027 26 arial,-1,12,5,40,0,0,0,0,0
-0  8 -3 1022 311
-"mapping  g_mQueryReplies;
-dyn_string g_dsSystems;
-
-// neu - fuer bessere performance in callback
-bool g_firstHL;
-int g_screenType;
-// property dp name
-string g_propDp;
-// Top/Bot info
-int g_tabType;
-// column name of register tab ( to build the tabheader eg Top/Alerts/Open )
-string g_regColumn;
-// mode
-int g_valType;
-dyn_string g_systemSelections;
-
-
-//////// neue variablen fuer configMatrix, settings and table eval commands append/update/delete
-dyn_dyn_anytype g_configMatrix;
-dyn_anytype     g_configSettings;
-
-string          g_tableCmdAppend;
-string          g_tableCmdUpdate;
-string          g_tableCmdDelete;
-
-dyn_string      g_colNames;
-bool            g_useFontProp;
-int             g_dpidIdx;
-int             g_timeIdx;
-int             g_countIdx;
-
-dyn_string      g_attrList;
-
-//*****************************
-// from old as/es_init() ***begin
-
-// momentan wird das prefix as fuer beide verwendet / es routinen werden angepasst
-// arbeitsvariablen muessen scriptglobal( pro tabelle) sein !!!!!!!!!!!
-int g_asDisplayLines = 0;
-int g_asDisplayDpes = 0;
-int g_asDisplayHours = 0;
-
-// halten die werte fuer AES_TYPEFILTER/TYPECONST ( == panelglobal )
-dyn_string g_typeFilter;
-dyn_int g_typeConst;
-
-//*****************************
-// from old aes_init() *****end
-
-
-///////////////////////////////////////////////
-// from old screen ***********************begin
-// new
-bool     g_historicalData;
-int      g_historicalDataInterval;   // display interval in sec back from now / only open mode 
-int      g_queryBlockedTime; // holds to queryblocktime in ms / see general settings
-dyn_bool g_colVis;           // holds the flag wheter an optional column is visible or not
-string   g_connectId;        // holds id of current query
-dyn_string g_counterConnectId; // holds numbers of Id's
-dyn_string g_closedIdf;      // new
-
-bool     g_checkAll;         // holds property setting - connect all systems
-time     g_timeLastUpdate;   // holds time of the last update
-string   g_dpCommentFilter;  // store filter
-
-bool     g_showInternals;    // value from _Config.ShowInternals
-bool     g_showInternalsA;    // value from _Config.ShowInternalDPs.Alerts
-bool     g_showInternalsAR;   // value from _Config.ShowInternalDPs.AlertRow
-bool     g_showInternalsE;    // value from _Config.ShowInternalDPs.Events
-
-unsigned g_maxClosedLines;   // max num of lines to be queried by closed protocoll
-unsigned g_state;            // alert-state filter
-
-int g_busyThread;    // id of thread, which shows busyness
-
-int g_maxLines;      // num of max lines in open protocoll
-
-// TI 14075 (discarding pending values)
-int        g_discardThread;
-time       g_discardStart;
-bool       g_discarded;
-const time MINCB_TIME = 2;
-const time MAXCB_TIME = 5;
-
-// characters for status-bits in current language
-// only for Events
-char g_Cdefault, g_Cout_prange, g_Cinvalid, g_Cfrom_GI, g_Cuserbit1, g_Cuserbit2;
-
-// IM 114080 - moved from aes.ctl
-dyn_string g_dsWorkAttr, g_dsWorkName, g_dsWorkVsbl;
-
-///////////////////////////////////////////////
-// from old screen *************************end
-
-main()
-{
-  aes_initMainTable( AESTAB_TOP );
-}
-" 0
-"main(int row, string column, string value)
-{
-  mapping mTableRow;
-  
-  synchronized(g_bTableLineSynchronisation)
-  { 
-    int length;
-    dyn_anytype alertRow;  
-    
-    alertRow = this.getLineN(row);
-    
-    length = dynlen(alertRow);
-    for(int i=1; i<=length; i++)
-      mTableRow[this.columnName(i-1)] = alertRow[i];
-  }
-
-  aes_doColumnClick( AESTAB_TOP, row, column, value, mTableRow );
-}
-" 0
- 1 0 1 60 66 "#1" 3 1 1 "s" 4
-LANG:1 2 #1
-LANG:10000 4 Time
-LANG:10001 2 #1
-LANG:10027 10 Время
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-40 "#2" 2 1 1 "s" 4
-LANG:1 2 #2
-LANG:10000 2 #2
-LANG:10001 2 #2
-LANG:10027 2 #2
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-33 "#3" 16 1 1 "s" 4
-LANG:1 2 #3
-LANG:10000 2 #3
-LANG:10001 2 #3
-LANG:10027 2 #3
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-153 "#4" 24 1 1 "s" 4
-LANG:1 2 #4
-LANG:10000 2 #4
-LANG:10001 2 #4
-LANG:10027 2 #4
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-232 "#5" 16 1 1 "s" 4
-LANG:1 2 #5
-LANG:10000 2 #5
-LANG:10001 2 #5
-LANG:10027 2 #5
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-152 "#6" 3 1 1 "s" 4
-LANG:1 2 #6
-LANG:10000 2 #6
-LANG:10001 2 #6
-LANG:10027 2 #6
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-43 "#7" 5 1 1 "s" 4
-LANG:1 2 #7
-LANG:10000 2 #7
-LANG:10001 2 #7
-LANG:10027 2 #7
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-61 "#8" 2 1 1 "s" 4
-LANG:1 2 #8
-LANG:10000 2 #8
-LANG:10001 2 #8
-LANG:10027 2 #8
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-32 "#9" 14 1 1 "s" 4
-LANG:1 2 #9
-LANG:10000 2 #9
-LANG:10001 2 #9
-LANG:10027 2 #9
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-136 "#10" 3 1 1 "s" 4
-LANG:1 3 #10
-LANG:10000 3 #10
-LANG:10001 3 #10
-LANG:10027 3 #10
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-38 "#11" 1 1 1 "s" 4
-LANG:1 3 #11
-LANG:10000 3 #11
-LANG:10001 3 #11
-LANG:10027 3 #11
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#12" 1 1 1 "s" 4
-LANG:1 3 #12
-LANG:10000 3 #12
-LANG:10001 3 #12
-LANG:10027 3 #12
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#13" 1 1 1 "s" 4
-LANG:1 3 #13
-LANG:10000 3 #13
-LANG:10001 3 #13
-LANG:10027 3 #13
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#14" 1 1 1 "s" 4
-LANG:1 3 #14
-LANG:10000 3 #14
-LANG:10001 3 #14
-LANG:10027 3 #14
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#15" 1 1 1 "s" 4
-LANG:1 3 #15
-LANG:10000 3 #15
-LANG:10001 3 #15
-LANG:10027 3 #15
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#16" 1 1 1 "s" 4
-LANG:1 3 #16
-LANG:10000 3 #16
-LANG:10001 3 #16
-LANG:10027 3 #16
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#17" 1 1 1 "s" 4
-LANG:1 3 #17
-LANG:10000 3 #17
-LANG:10001 3 #17
-LANG:10027 3 #17
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#18" 1 1 1 "s" 4
-LANG:1 3 #18
-LANG:10000 3 #18
-LANG:10001 3 #18
-LANG:10027 3 #18
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#19" 1 1 1 "s" 4
-LANG:1 3 #19
-LANG:10000 3 #19
-LANG:10001 3 #19
-LANG:10027 3 #19
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#20" 1 1 1 "s" 4
-LANG:1 3 #20
-LANG:10000 3 #20
-LANG:10001 3 #20
-LANG:10027 3 #20
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#21" 1 1 1 "s" 4
-LANG:1 3 #21
-LANG:10000 3 #21
-LANG:10001 3 #21
-LANG:10027 3 #21
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#22" 1 1 1 "s" 4
-LANG:1 3 #22
-LANG:10000 3 #22
-LANG:10001 3 #22
-LANG:10027 3 #22
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#23" 1 1 1 "s" 4
-LANG:1 3 #23
-LANG:10000 3 #23
-LANG:10001 3 #23
-LANG:10027 3 #23
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#24" 1 1 1 "s" 4
-LANG:1 3 #24
-LANG:10000 3 #24
-LANG:10001 3 #24
-LANG:10027 3 #24
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#25" 1 1 1 "s" 4
-LANG:1 3 #25
-LANG:10000 3 #25
-LANG:10001 3 #25
-LANG:10027 3 #25
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#26" 1 1 1 "s" 4
-LANG:1 3 #26
-LANG:10000 3 #26
-LANG:10001 3 #26
-LANG:10027 3 #26
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#27" 1 1 1 "s" 4
-LANG:1 3 #27
-LANG:10000 3 #27
-LANG:10001 3 #27
-LANG:10027 3 #27
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#28" 1 1 1 "s" 4
-LANG:1 3 #28
-LANG:10000 3 #28
-LANG:10001 3 #28
-LANG:10027 3 #28
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#29" 1 1 1 "s" 4
-LANG:1 3 #29
-LANG:10000 3 #29
-LANG:10001 3 #29
-LANG:10027 3 #29
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#30" 1 1 1 "s" 4
-LANG:1 3 #30
-LANG:10000 3 #30
-LANG:10001 3 #30
-LANG:10027 3 #30
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#31" 1 0 1 "s" 4
-LANG:1 3 #31
-LANG:10000 3 #31
-LANG:10001 3 #31
-LANG:10027 3 #31
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#32" 1 0 1 "s" 4
-LANG:1 3 #32
-LANG:10000 3 #32
-LANG:10001 3 #32
-LANG:10027 3 #32
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#33" 1 0 1 "s" 4
-LANG:1 3 #33
-LANG:10000 3 #33
-LANG:10001 3 #33
-LANG:10027 3 #33
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#34" 1 0 1 "s" 4
-LANG:1 3 #34
-LANG:10000 3 #34
-LANG:10001 3 #34
-LANG:10027 3 #34
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#35" 1 0 1 "s" 4
-LANG:1 3 #35
-LANG:10000 3 #35
-LANG:10001 3 #35
-LANG:10027 3 #35
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#36" 0 0 1 "s" 4
-LANG:1 3 #36
-LANG:10000 3 #36
-LANG:10001 3 #36
-LANG:10027 3 #36
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#37" 0 0 1 "s" 4
-LANG:1 3 #37
-LANG:10000 3 #37
-LANG:10001 3 #37
-LANG:10027 3 #37
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#38" 0 0 1 "s" 4
-LANG:1 3 #38
-LANG:10000 3 #38
-LANG:10001 3 #38
-LANG:10027 3 #38
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#39" 0 0 1 "s" 4
-LANG:1 3 #39
-LANG:10000 3 #39
-LANG:10001 3 #39
-LANG:10027 3 #39
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#40" 0 0 1 "s" 4
-LANG:1 3 #40
-LANG:10000 3 #40
-LANG:10001 3 #40
-LANG:10027 3 #40
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#41" 0 0 1 "s" 4
-LANG:1 3 #41
-LANG:10000 3 #41
-LANG:10001 3 #41
-LANG:10027 3 #41
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#42" 0 0 1 "s" 4
-LANG:1 3 #42
-LANG:10000 3 #42
-LANG:10001 3 #42
-LANG:10027 3 #42
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#43" 0 0 1 "s" 4
-LANG:1 3 #43
-LANG:10000 3 #43
-LANG:10001 3 #43
-LANG:10027 3 #43
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#44" 0 0 1 "s" 4
-LANG:1 3 #44
-LANG:10000 3 #44
-LANG:10001 3 #44
-LANG:10027 3 #44
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#45" 0 0 1 "s" 4
-LANG:1 3 #45
-LANG:10000 3 #45
-LANG:10001 3 #45
-LANG:10027 3 #45
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#46" 0 0 1 "s" 4
-LANG:1 3 #46
-LANG:10000 3 #46
-LANG:10001 3 #46
-LANG:10027 3 #46
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#47" 0 0 1 "s" 4
-LANG:1 3 #47
-LANG:10000 3 #47
-LANG:10001 3 #47
-LANG:10027 3 #47
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#48" 0 0 1 "s" 4
-LANG:1 3 #48
-LANG:10000 3 #48
-LANG:10001 3 #48
-LANG:10027 3 #48
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#49" 0 0 1 "s" 4
-LANG:1 3 #49
-LANG:10000 3 #49
-LANG:10001 3 #49
-LANG:10027 3 #49
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#50" 0 0 1 "s" 4
-LANG:1 3 #50
-LANG:10000 3 #50
-LANG:10001 3 #50
-LANG:10027 3 #50
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#51" 0 0 1 "s" 4
-LANG:1 3 #51
-LANG:10000 3 #51
-LANG:10001 3 #51
-LANG:10027 3 #51
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#52" 0 0 1 "s" 4
-LANG:1 3 #52
-LANG:10000 3 #52
-LANG:10001 3 #52
-LANG:10027 3 #52
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#53" 0 0 1 "s" 4
-LANG:1 3 #53
-LANG:10000 3 #53
-LANG:10001 3 #53
-LANG:10027 3 #53
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#54" 0 0 1 "s" 4
-LANG:1 3 #54
-LANG:10000 3 #54
-LANG:10001 3 #54
-LANG:10027 3 #54
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#55" 0 0 1 "s" 4
-LANG:1 3 #55
-LANG:10000 3 #55
-LANG:10001 3 #55
-LANG:10027 3 #55
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#56" 0 0 1 "s" 4
-LANG:1 3 #56
-LANG:10000 3 #56
-LANG:10001 3 #56
-LANG:10027 3 #56
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#57" 0 0 1 "s" 4
-LANG:1 3 #57
-LANG:10000 3 #57
-LANG:10001 3 #57
-LANG:10027 3 #57
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#58" 0 0 1 "s" 4
-LANG:1 3 #58
-LANG:10000 3 #58
-LANG:10001 3 #58
-LANG:10027 3 #58
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#59" 0 0 1 "s" 4
-LANG:1 3 #59
-LANG:10000 3 #59
-LANG:10001 3 #59
-LANG:10027 3 #59
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#60" 0 0 1 "s" 4
-LANG:1 3 #60
-LANG:10000 3 #60
-LANG:10001 3 #60
-LANG:10027 3 #60
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 
-17 17 "" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-8 30
-4
-LANG:1 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10027 26 arial,-1,12,5,40,0,0,0,0,0
-0 0 2 1 1 7
-1 0
-25 17
-"table_bot"
-""
-1 10 619 E E E 1 E 0 E N "_WindowText" E N "_Window" E "main(int iType)
-{
-  int tableAckAction;
-  mapping mTableMultipleRows;
-  
-//check if there is an column _ACKABLE_ otherwise it is the event screen and there is nothing to ack
-  
-  int iCnt, i;
-  iCnt=this.columnCount();
-  for (i=1; i<=iCnt; i++)
-  {
-    if (this.columnName(i-1) == _ACKABLE_)
-    {
-      i = iCnt+2;
-      break;
-    }
-  }
-  if (i!=iCnt+2) //_ACKABLE_ was not found
-    return;
-
-
-  //added support for SINGLE ACK mode to work per line instead of on whole widget
-  tableAckAction = (iType == DPATTR_ACKTYPE_SINGLE)?AES_CHANGED_ACKSINGLE:AES_CHANGED_ACKALLVIS;
-  
-  synchronized(g_bTableLineSynchronisation)
-  {
-    aes_prepareForTableAcknowledge(tableAckAction, AESTAB_BOT, mTableMultipleRows);    
-  }
-  
-  aes_acknowledgeTableFunction( this.name, \"1\", mTableMultipleRows);
-}
-
-
-" 0
-
- "main(int row, string column)
-{
-  int i, j;
-  anytype value;
-  mapping mTableMultipleRows;
-  dyn_int diSelectedLines;
-  
-  //IM 116642: Trigger table widget once, to avoid timing problems
-  int top, bot;
-  getValue(\"\", \"lineRangeVisible\", top, bot);
-  
-  synchronized(g_bTableLineSynchronisation)
-  { 
-    int length;
-    dyn_anytype alertRow;  
-    
-    value=this.cellValue;
-    int iLineCnt = this.lineCount;
-    
-    dyn_string columnNames = makeDynString();
-
-
-    
-    for (j=0; j<iLineCnt; j++)
-    {
-
-      alertRow = this.getLineN(j);
-      length = dynlen(alertRow);
-      
-      if (dynlen(columnNames)==0) //read column names once
-      {
-        for (i = length; i>0; i--)
-          columnNames[i]= this.columnName(i-1);
-      }
-    
-      mapping rowHeaderMapping;
-      
-      for(i=1; i<=length; i++)
-        rowHeaderMapping[columnNames[i]] = alertRow[i];
-      
-      mTableMultipleRows[j] = rowHeaderMapping;
-    }
-    
-    diSelectedLines = this.getSelectedLines();
-  }
-
-  aes_onRightClick( g_propDpNameBot, AESTAB_BOT, this.name, row, column, value, mTableMultipleRows, diSelectedLines );
-}
-
-" 0
- "main()
-{
-  int row, column;
-  anytype value;
-  mapping mTableRow;
-  
-  synchronized(g_bTableLineSynchronisation)
-  { 
-    int length;
-    dyn_anytype alertRow;  
-        
-    // determine position 
-    getValue(\"\",\"currentCell\", row, column );
-    // and content of active cell !
-    getValue(\"\",\"cellValue\", value );
-
-    alertRow = this.getLineN(row);
-    length = dynlen(alertRow);
-    for(int i=1; i<=length; i++)
-      mTableRow[this.columnName(i-1)] = alertRow[i];
-  }
-
-  aes_doColumnDblClick( g_propDpNameBot, row, column, value, mTableRow );
-}
-" 0
-
-16 0 0 0 0 0
-"main()
-{
-  reg_main.namedActiveRegister( AES_TABNAME_BOT );
-}" 0
- E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-1
-"scrolledCB" "synchronized main()
-{
-  aes_scrollHandling(AESTAB_TOP, g_iLineHoldThreadTop);
-}"
-4
-LANG:1 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10027 26 arial,-1,12,5,40,0,0,0,0,0
-0  8 308 1022 622
-"mapping  g_mQueryReplies;
-dyn_string g_dsSystems;
-
-// neu - fuer bessere performance in callback
-bool g_firstHL = true;
-bool lastSystem = false;
-int g_screenType;
-// property dp name
-string g_propDp;
-// Top/Bot info
-int g_tabType;
-// column name of register tab ( to build the tabheader eg Top/Alerts/Open )
-string g_regColumn;
-// mode
-int g_valType;
-dyn_string g_systemSelections;
-
-//////// neue variablen fuer configMatrix, settings and table eval commands append/update/delete
-dyn_dyn_anytype g_configMatrix;
-dyn_anytype     g_configSettings;
-
-string          g_tableCmdAppend;
-string          g_tableCmdUpdate;
-string          g_tableCmdDelete;
-
-dyn_string      g_colNames;
-bool            g_useFontProp;
-int             g_dpidIdx;
-int             g_timeIdx;
-int             g_countIdx;
-
-dyn_string      g_attrList;
-
-//*****************************
-// from old as/es_init() ***begin
-
-// momentan wird das prefix as fuer beide verwendet / es routinen werden angepasst
-// arbeitsvariablen muessen scriptglobal( pro tabelle) sein !!!!!!!!!!!
-int g_asDisplayLines = 0;
-int g_asDisplayDpes = 0;
-int g_asDisplayHours = 0;
-
-// halten die werte fuer AES_TYPEFILTER/TYPECONST ( == panelglobal )
-dyn_string g_typeFilter;
-dyn_int g_typeConst;
-
-//*****************************
-// from old aes_init() *****end
-
-
-///////////////////////////////////////////////
-// from old screen ***********************begin
-// new
-bool     g_historicalData;
-int      g_historicalDataInterval;   // display interval in sec back from now / only open mode 
-int      g_queryBlockedTime; // holds to queryblocktime in ms / see general settings
-dyn_bool g_colVis;           // holds the flag wheter an optional column is visible or not
-string   g_connectId;        // holds id of current query
-dyn_string g_counterConnectId; // holds numbers of Id's
-dyn_string g_closedIdf;      // new
-
-bool     g_checkAll;         // holds property setting - connect all systems
-time     g_timeLastUpdate;   // holds time of the last update
-string   g_dpCommentFilter;  // store filter
-
-bool     g_showInternals;    // value from _Config.ShowInternals
-
-bool     g_showInternalsA;    // value from _Config.ShowInternalDPs.Alerts
-bool     g_showInternalsAR;   // value from _Config.ShowInternalDPs.AlertRow
-bool     g_showInternalsE;    // value from _Config.ShowInternalDPs.Events
-
-unsigned g_maxClosedLines;   // max num of lines to be queried by closed protocoll
-unsigned g_state;            // alert-state filter
-
-int g_busyThread;    // id of thread, which shows busyness
-
-int g_maxLines;      // num of max lines in open protocoll
-
-// TI 14075 (discarding pending values)
-int        g_discardThread;
-time       g_discardStart;
-bool       g_discarded;
-const time MINCB_TIME = 2;
-const time MAXCB_TIME = 5;
-
-// characters for status-bits in current language
-// only for Events
-char g_Cdefault, g_Cout_prange, g_Cinvalid, g_Cfrom_GI, g_Cuserbit1, g_Cuserbit2;
-
-// IM 114080 - moved from aes.ctl
-dyn_string g_dsWorkAttr, g_dsWorkName, g_dsWorkVsbl;
-
-///////////////////////////////////////////////
-// from old screen *************************end
-
-main()
-{
-  aes_initMainTable( AESTAB_BOT );
-}
-" 0
-"main(int row, string column, string value)
-{
-  mapping mTableRow;
-  
-  synchronized(g_bTableLineSynchronisation)
-  { 
-    int length;
-    dyn_anytype alertRow;  
-    
-    alertRow = this.getLineN(row);
-    
-    length = dynlen(alertRow);
-    for(int i=1; i<=length; i++)
-      mTableRow[this.columnName(i-1)] = alertRow[i];
-  }
- 
-  aes_doColumnClick( AESTAB_BOT, row, column, value, mTableRow );
-}
-" 0
- 1 0 1 60 66 "#1" 3 1 1 "s" 4
-LANG:1 2 #1
-LANG:10000 4 Time
-LANG:10001 2 #1
-LANG:10027 10 Время
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-40 "#2" 2 1 1 "s" 4
-LANG:1 2 #2
-LANG:10000 2 #2
-LANG:10001 2 #2
-LANG:10027 2 #2
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-33 "#3" 16 1 1 "s" 4
-LANG:1 2 #3
-LANG:10000 2 #3
-LANG:10001 2 #3
-LANG:10027 2 #3
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-153 "#4" 24 1 1 "s" 4
-LANG:1 2 #4
-LANG:10000 2 #4
-LANG:10001 2 #4
-LANG:10027 2 #4
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-232 "#5" 16 1 1 "s" 4
-LANG:1 2 #5
-LANG:10000 2 #5
-LANG:10001 2 #5
-LANG:10027 2 #5
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-152 "#6" 3 1 1 "s" 4
-LANG:1 2 #6
-LANG:10000 2 #6
-LANG:10001 2 #6
-LANG:10027 2 #6
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-43 "#7" 5 1 1 "s" 4
-LANG:1 2 #7
-LANG:10000 2 #7
-LANG:10001 2 #7
-LANG:10027 2 #7
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-61 "#8" 2 1 1 "s" 4
-LANG:1 2 #8
-LANG:10000 2 #8
-LANG:10001 2 #8
-LANG:10027 2 #8
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-32 "#9" 14 1 1 "s" 4
-LANG:1 2 #9
-LANG:10000 2 #9
-LANG:10001 2 #9
-LANG:10027 2 #9
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-136 "#10" 3 1 1 "s" 4
-LANG:1 3 #10
-LANG:10000 3 #10
-LANG:10001 3 #10
-LANG:10027 3 #10
-E
-4
 LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-38 "#11" 1 1 1 "s" 4
-LANG:1 3 #11
-LANG:10000 3 #11
-LANG:10001 3 #11
-LANG:10027 3 #11
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#12" 1 1 1 "s" 4
-LANG:1 3 #12
-LANG:10000 3 #12
-LANG:10001 3 #12
-LANG:10027 3 #12
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#13" 1 1 1 "s" 4
-LANG:1 3 #13
-LANG:10000 3 #13
-LANG:10001 3 #13
-LANG:10027 3 #13
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#14" 1 1 1 "s" 4
-LANG:1 3 #14
-LANG:10000 3 #14
-LANG:10001 3 #14
-LANG:10027 3 #14
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#15" 1 1 1 "s" 4
-LANG:1 3 #15
-LANG:10000 3 #15
-LANG:10001 3 #15
-LANG:10027 3 #15
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#16" 1 1 1 "s" 4
-LANG:1 3 #16
-LANG:10000 3 #16
-LANG:10001 3 #16
-LANG:10027 3 #16
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#17" 1 1 1 "s" 4
-LANG:1 3 #17
-LANG:10000 3 #17
-LANG:10001 3 #17
-LANG:10027 3 #17
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#18" 1 1 1 "s" 4
-LANG:1 3 #18
-LANG:10000 3 #18
-LANG:10001 3 #18
-LANG:10027 3 #18
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#19" 1 1 1 "s" 4
-LANG:1 3 #19
-LANG:10000 3 #19
-LANG:10001 3 #19
-LANG:10027 3 #19
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#20" 1 1 1 "s" 4
-LANG:1 3 #20
-LANG:10000 3 #20
-LANG:10001 3 #20
-LANG:10027 3 #20
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#21" 1 1 1 "s" 4
-LANG:1 3 #21
-LANG:10000 3 #21
-LANG:10001 3 #21
-LANG:10027 3 #21
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#22" 1 1 1 "s" 4
-LANG:1 3 #22
-LANG:10000 3 #22
-LANG:10001 3 #22
-LANG:10027 3 #22
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#23" 1 1 1 "s" 4
-LANG:1 3 #23
-LANG:10000 3 #23
-LANG:10001 3 #23
-LANG:10027 3 #23
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#24" 1 1 1 "s" 4
-LANG:1 3 #24
-LANG:10000 3 #24
-LANG:10001 3 #24
-LANG:10027 3 #24
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#25" 1 1 1 "s" 4
-LANG:1 3 #25
-LANG:10000 3 #25
-LANG:10001 3 #25
-LANG:10027 3 #25
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#26" 1 1 1 "s" 4
-LANG:1 3 #26
-LANG:10000 3 #26
-LANG:10001 3 #26
-LANG:10027 3 #26
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#27" 1 1 1 "s" 4
-LANG:1 3 #27
-LANG:10000 3 #27
-LANG:10001 3 #27
-LANG:10027 3 #27
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#28" 1 1 1 "s" 4
-LANG:1 3 #28
-LANG:10000 3 #28
-LANG:10001 3 #28
-LANG:10027 3 #28
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#29" 1 1 1 "s" 4
-LANG:1 3 #29
-LANG:10000 3 #29
-LANG:10001 3 #29
-LANG:10027 3 #29
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#30" 1 1 1 "s" 4
-LANG:1 3 #30
-LANG:10000 3 #30
-LANG:10001 3 #30
-LANG:10027 3 #30
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#31" 1 0 1 "s" 4
-LANG:1 3 #31
-LANG:10000 3 #31
-LANG:10001 3 #31
-LANG:10027 3 #31
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#32" 1 0 1 "s" 4
-LANG:1 3 #32
-LANG:10000 3 #32
-LANG:10001 3 #32
-LANG:10027 3 #32
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#33" 1 0 1 "s" 4
-LANG:1 3 #33
-LANG:10000 3 #33
-LANG:10001 3 #33
-LANG:10027 3 #33
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#34" 1 0 1 "s" 4
-LANG:1 3 #34
-LANG:10000 3 #34
-LANG:10001 3 #34
-LANG:10027 3 #34
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#35" 1 0 1 "s" 4
-LANG:1 3 #35
-LANG:10000 3 #35
-LANG:10001 3 #35
-LANG:10027 3 #35
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-24 "#36" 0 0 1 "s" 4
-LANG:1 3 #36
-LANG:10000 3 #36
-LANG:10001 3 #36
-LANG:10027 3 #36
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#37" 0 0 1 "s" 4
-LANG:1 3 #37
-LANG:10000 3 #37
-LANG:10001 3 #37
-LANG:10027 3 #37
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#38" 0 0 1 "s" 4
-LANG:1 3 #38
-LANG:10000 3 #38
-LANG:10001 3 #38
-LANG:10027 3 #38
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#39" 0 0 1 "s" 4
-LANG:1 3 #39
-LANG:10000 3 #39
-LANG:10001 3 #39
-LANG:10027 3 #39
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#40" 0 0 1 "s" 4
-LANG:1 3 #40
-LANG:10000 3 #40
-LANG:10001 3 #40
-LANG:10027 3 #40
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#41" 0 0 1 "s" 4
-LANG:1 3 #41
-LANG:10000 3 #41
-LANG:10001 3 #41
-LANG:10027 3 #41
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#42" 0 0 1 "s" 4
-LANG:1 3 #42
-LANG:10000 3 #42
-LANG:10001 3 #42
-LANG:10027 3 #42
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#43" 0 0 1 "s" 4
-LANG:1 3 #43
-LANG:10000 3 #43
-LANG:10001 3 #43
-LANG:10027 3 #43
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#44" 0 0 1 "s" 4
-LANG:1 3 #44
-LANG:10000 3 #44
-LANG:10001 3 #44
-LANG:10027 3 #44
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#45" 0 0 1 "s" 4
-LANG:1 3 #45
-LANG:10000 3 #45
-LANG:10001 3 #45
-LANG:10027 3 #45
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#46" 0 0 1 "s" 4
-LANG:1 3 #46
-LANG:10000 3 #46
-LANG:10001 3 #46
-LANG:10027 3 #46
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#47" 0 0 1 "s" 4
-LANG:1 3 #47
-LANG:10000 3 #47
-LANG:10001 3 #47
-LANG:10027 3 #47
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#48" 0 0 1 "s" 4
-LANG:1 3 #48
-LANG:10000 3 #48
-LANG:10001 3 #48
-LANG:10027 3 #48
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#49" 0 0 1 "s" 4
-LANG:1 3 #49
-LANG:10000 3 #49
-LANG:10001 3 #49
-LANG:10027 3 #49
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#50" 0 0 1 "s" 4
-LANG:1 3 #50
-LANG:10000 3 #50
-LANG:10001 3 #50
-LANG:10027 3 #50
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#51" 0 0 1 "s" 4
-LANG:1 3 #51
-LANG:10000 3 #51
-LANG:10001 3 #51
-LANG:10027 3 #51
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#52" 0 0 1 "s" 4
-LANG:1 3 #52
-LANG:10000 3 #52
-LANG:10001 3 #52
-LANG:10027 3 #52
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#53" 0 0 1 "s" 4
-LANG:1 3 #53
-LANG:10000 3 #53
-LANG:10001 3 #53
-LANG:10027 3 #53
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#54" 0 0 1 "s" 4
-LANG:1 3 #54
-LANG:10000 3 #54
-LANG:10001 3 #54
-LANG:10027 3 #54
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#55" 0 0 1 "s" 4
-LANG:1 3 #55
-LANG:10000 3 #55
-LANG:10001 3 #55
-LANG:10027 3 #55
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#56" 0 0 1 "s" 4
-LANG:1 3 #56
-LANG:10000 3 #56
-LANG:10001 3 #56
-LANG:10027 3 #56
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#57" 0 0 1 "s" 4
-LANG:1 3 #57
-LANG:10000 3 #57
-LANG:10001 3 #57
-LANG:10027 3 #57
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#58" 0 0 1 "s" 4
-LANG:1 3 #58
-LANG:10000 3 #58
-LANG:10001 3 #58
-LANG:10027 3 #58
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#59" 0 0 1 "s" 4
-LANG:1 3 #59
-LANG:10000 3 #59
-LANG:10001 3 #59
-LANG:10027 3 #59
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 "#60" 0 0 1 "s" 4
-LANG:1 3 #60
-LANG:10000 3 #60
-LANG:10001 3 #60
-LANG:10027 3 #60
-E
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0 
-17 17 "" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-"" 1 4
-LANG:1 5 row_1
-LANG:10000 5 row_1
-LANG:10001 5 row_1
-LANG:10027 5 row_1
-8 30
-4
-LANG:1 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,12,5,40,0,0,0,0,0
-LANG:10027 26 arial,-1,12,5,40,0,0,0,0,0
-0 0 2 1 1 7
-1 0
-22 19
-"cb_aesConfig"
-""
-1 760.0000000000001 759 E E E 1 E 1 E N {0,0,0} E N "_Window" E E
- E E
-17 0 0 0 0 0
-E E E
-0
-4
-LANG:1 20 Screen configuration
-LANG:10000 19 Schirmkonfigutation
-LANG:10001 20 Screen configuration
-LANG:10027 37 Конфигурация экрана
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  758 758 932 785
-0
-
-E
-"main()
-{
-  string screenConfigName;
-  
-  screenConfigName=this.text;
-  aes_screenConfigChanged( screenConfigName );
-
-}" 0
-
-E
- 0 0
-13 20
-"pb_close"
-""
-1 937 759 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
- E E
-18 0 0 0 0 0
-E E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  935 758 1023 786
-
-T 
-4
-LANG:1 5 Close
-LANG:10000 10 Schließen
-LANG:10001 5 Close
-LANG:10027 14 Закрыть
-"main()
-{
-  aes_panelOff( true );
-}" 0
- E E E
-13 21
-"cmdHelp"
-""
-1 20 760 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
- E E
-19 0 0 0 112 0
-E E E
-0
-4
-LANG:1 16 Online help [F1]
-LANG:10000 17 Online Hilfe [F1]
-LANG:10001 16 Online help [F1]
-LANG:10027 19 Справка [F1]
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  18 758 106 786
-
-T 
-4
-LANG:1 4 Help
-LANG:10000 5 Hilfe
-LANG:10001 4 Help
-LANG:10027 14 Справка
-"main()
-{
- std_help(\"AES_MainGeneral\", TRUE);
-}
-" 0
- E E E
-14 25
-"TextField1"
-""
-1 650 628 E E E 1 E 0 E N "_WindowText" E N "_Window" E E
- E E
-22 0 0 0 0 0
-E E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  648 626 842 653
-3 "0s" 0 0 0 0 0 -1  E "main()
-{
-  this.text=myUiNumber() + \"_\" + myModuleName();
-}" 0
- E
-1 28 0 "" 0
-0
-29 11
-"sl_gauge"
-""
-1 1020 1.099120794378905e-013 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
- E E
-11 0 0 0 0 0
-E E E
-0
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-
-8
-"invertedAppearance" "bool TRUE"
-"minValue" "int 1"
-"lineStep" "int 1"
-"backgroundOrigin" "enum 0"
-"value" "int 50"
-"tickInterval" "int 1"
-"maxValue" "int 99"
-"invertedAppearance" "bool TRUE"
-4
-LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
-LANG:10000 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
-LANG:10001 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
-LANG:10027 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
-0  1020 0 1043 620
-12 SliderWidget
-2
-0 "Slide" "(int value)"
-"  int perc;
-  bool fromSlider=true;
-
-  perc=this.value;
-  
-  if( g_regInitReady == AES_INITSTATE_OK ) 
-  {
-    aes_setSplitPosition( g_top, g_bottom, perc, fromSlider );
-  }"
-0 "Change" "(int value)"
-"  int perc;
-  bool fromSlider=true;
-
-  perc=this.value;
-  
-  if( g_regInitReady == AES_INITSTATE_OK ) 
-  {
-    aes_setSplitPosition( g_top, g_bottom, perc, fromSlider );
-  }"
-"int oldVal=0;
-
-main()
-{
-  int perc;
-
-  while( g_regInitReady == AES_INITSTATE_WAITING )
-  {    
-    delay( 0, 50 );
-  }
-
-  if( g_regInitReady == AES_INITSTATE_FAILURE )
-  {
-    return;
-  } 
-  
-  while( true )
-  {
-    perc=this.value;
-    if( perc != oldVal )
-    {
-      if( perc >= 0 && perc <= 100 )
-      {
-        while (!shapeExists(\"te_proportionTop\") || !shapeExists(\"te_proportionBot\"))
-           delay(0,100);
-
-        setMultiValue(
-          \"te_proportionTop\", \"text\", perc,
-          \"te_proportionBot\", \"text\", 100-perc );
-
-        oldVal=perc;
-        // save info to dp(only top)
-        dpSetCache( g_propDpNameTop+\".Settings.Proportion\"+AES_ORIVAL, perc );
-      }
-    }
-        
-    delay( 0, 500 );
-  }
-}" 0
-13 12
-"bt_topFull"
-""
-1 1022 0 E E E 1 E 0 E N "_ButtonText" E N "_Button" E E
- E E
-12 0 0 0 0 0
-E E E
-0
-4
-LANG:1 29 Expand top table to full size
-LANG:10000 43 Expandiere obere Tabelle auf Maximalgröße
-LANG:10001 29 Expand top table to full size
-LANG:10027 73 Максимально развернуть верхнюю таблицу
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  1020 -2 1044 32
-
-P 
-10040064
-"12.png"
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-"main()
-{
-  aes_setTopFullSize( g_top, g_bottom );
-}" 0
- E E E
-13 15
-"bt_topSplit"
-""
-1 1022 0 E E E 1 E 0 E N "_ButtonText" E N "_Button" E E
- E E
-15 0 0 0 0 0
-E E E
-0
-4
-LANG:1 20 Change to split view
-LANG:10000 29 Wechsle zur Splittdarstellung
-LANG:10001 20 Change to split view
-LANG:10027 67 Перейти к раздельному представлению
-
+1 1 0 "" 26
 0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  1020 -2 1044 32
-
-P 
-10040064
-"15.png"
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-"main()
-{
-  // g_percent - state before full mode
-  aes_resetSplitPosition( g_top, g_bottom );
-}" 0
- E E E
-13 14
-"bt_botFull"
-""
-1 1022 589 E E E 1 E 0 E N "_ButtonText" E N "_Button" E E
- E E
-14 0 0 0 0 0
-E E E
-0
-4
-LANG:1 32 Expand bottom table to full size
-LANG:10000 44 Expandiere untere Tabelle auf Maximalgröße
-LANG:10001 32 Expand bottom table to full size
-LANG:10027 71 Максимально развернуть нижнюю таблицу
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  1020 587 1044 621
-
-P 
-10040064
-"14.png"
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-"main()
-{
-  aes_setBottomFullSize( g_top, g_bottom );
-}" 0
- E E E
-13 16
-"bt_botSplit"
-""
-1 1022 589 E E E 1 E 0 E N "_ButtonText" E N "_Button" E E
- E E
-16 0 0 0 0 0
-E E E
-0
-4
-LANG:1 20 Change to split view
-LANG:10000 29 Wechsle zur Splittdarstellung
-LANG:10001 20 Change to split view
-LANG:10027 67 Перейти к раздельному представлению
-
-0
-4
-LANG:1 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10000 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10001 26 Arial,-1,13,5,40,0,0,0,0,0
-LANG:10027 26 Arial,-1,13,5,40,0,0,0,0,0
-0  1020 587 1044 621
-
-P 
-10040064
-"16.png"
-4
-LANG:1 0 
-LANG:10000 0 
-LANG:10001 0 
-LANG:10027 0 
-"main()
-{
-  // g_percent - state before full mode
-  aes_resetSplitPosition( g_top, g_bottom );
-}" 0
- E E E
 0
 LAYER, 1 
 1
-LANG:1 6 Layer2
+LANG:1 0 
 0
 LAYER, 2 
 1
-LANG:1 6 Layer3
+LANG:1 0 
 0
 LAYER, 3 
 1
-LANG:1 6 Layer4
+LANG:1 0 
 0
 LAYER, 4 
 1
-LANG:1 6 Layer5
+LANG:1 0 
 0
 LAYER, 5 
 1
-LANG:1 6 Layer6
+LANG:1 0 
 0
 LAYER, 6 
 1
-LANG:1 6 Layer7
+LANG:1 0 
 0
 LAYER, 7 
 1
-LANG:1 6 Layer8
+LANG:1 0 
 0
 3 0 "PANEL_REF0" -1
 "" ""
-"objects_parts/STD_OBJECTS/ButtonBarBackground.pnl" 115 735 T 23 2.225176157441873 0 1 -285.8952581058154 15
-0
+"vision/aes/AEScreen.pnl" -350 1100 T 0 1 0 1 410 130
+3
+"$ACTION"""
+"$FILENAME"""
+"$SCREENTYPE"""
 0
diff --git a/MAC/Navigator2/panels/objects/Hardware/powerUnit_small.pnl b/MAC/Navigator2/panels/objects/Hardware/powerUnit_small.pnl
index a47224eeac69ad122e668d25a8932468da0ff1ff..2395c38c041cbf787a01b8518cdf94abc1a87635 100644
--- a/MAC/Navigator2/panels/objects/Hardware/powerUnit_small.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/powerUnit_small.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
 1
 LANG:1 0 
 PANEL,-1 -1 388 166 N "_3DFace" 1
@@ -60,14 +60,17 @@ void updatePowec(string dp1, bool invalid,
                  string dp2, int nrOfModules,
                  string dp3, dyn_int OK)
 {
-
+  
   string tooltip= station + \" PowerUnit <br>\";
   string color = \"Lofar_operational\";
+  bool ok = true;
+  string db = dpSubStr(dp1,DPSUB_SYS);
   
   if (invalid)
   {
     color = \"Lofar_invalid\";
     tooltip += \"POWEC0: invalid, unit might be turned off?<br> Or wrong snmp protocol\";
+    ok=false;
   } 
   else
   {            
@@ -77,6 +80,7 @@ void updatePowec(string dp1, bool invalid,
     if (nrOfModules < 1) {  
       tooltip += \"POWEC0: nrOfModules = 0, unit might be stalled\";
       color = \"Lofar_suspicious\";
+      ok = false;
     }
     else if (nrOfModules != dynlen(OK))
     {
@@ -86,21 +90,37 @@ void updatePowec(string dp1, bool invalid,
     else 
     {
       tooltip += \"POWEC0: <br>\";
-      bool ok = true;
+
+      // PCS type controllers have 1=ok 2=error
+      int module_ok=1;    
+    
+      // new ACX type controllers have 0=ok 1=error
+      // DPT has to be extended with powerSystemType so we can be more flexible with the next check
+      if (db == \"PL610:\" || db == \"PL611:\" || db == \"PL612:\") module_ok = 0;
+    
       for (int i = 1; i <= nrOfModules; i++)
       {
-        if (OK[i] != 1)
+        if (OK[i] != module_ok)
         {
           ok = false;
           tooltip += \"        Module [\"+i+\"] not OK <br>\";
           color = \"Lofar_broken\";
         }     
       }
-      if (ok) tooltip += \"All Modules OK\";
     }
   }  
-  setValue(\"powerUnit\",\"toolTipText\",tooltip);
-  setValue(\"powerUnit\", \"backCol\", color);
+  if (ok) 
+  {
+    tooltip += \"All Modules OK <br>\";
+    color = \"Lofar_operational\";
+    setValue(\"powerUnit\",\"toolTipText\",tooltip);
+    setValue(\"powerUnit\", \"backCol\", color);
+  }
+  else
+  {
+    setValue(\"powerUnit\",\"toolTipText\",tooltip);
+    setValue(\"powerUnit\", \"backCol\", color);
+  }
 }
 
 void update2Powecs(string dp1, bool invalid1,
@@ -112,16 +132,20 @@ void update2Powecs(string dp1, bool invalid1,
 {
   string tooltip= station + \" PowerUnit <br>\";
   string color = \"Lofar_operational\";
+  bool ok = true;
+  string db = dpSubStr(dp1,DPSUB_SYS);
 
   if (invalid1)
   {
     color = \"Lofar_invalid\";
     tooltip += \"POWEC0: invalid, unit might be turned off?<br> Or wrong snmp protocol\";
+    ok=false;
   } 
   else if (invalid2)
   { 
     color = \"Lofar_invalid\";
     tooltip += \"POWEC1: invalid, unit might be turned off?<br> Or wrong snmp protocol\";
+    ok=false;
   } 
   // Sometimes the boards doesn't give an answer anymore, in that case nrOfModules = 0, so thats an error,
   // For now only a powercycle is known to resolve this issue
@@ -129,55 +153,71 @@ void update2Powecs(string dp1, bool invalid1,
   {  
     tooltip += \"POWEC0: nrOfModules = 0, unit might be stalled\";
     color = \"Lofar_suspicious\";
+    ok=false;
   }
   else if (nrOfModules2 < 1)
   {  
     tooltip += \"POWEC1: nrOfModules = 0, unit might be stalled\";
     color = \"Lofar_suspicious\";
+    ok=false;
   }
   else if (nrOfModules1 != dynlen(OK1))
   {
     tooltip += \"POWEC0: nrOfModules and OKArray length differ\";
     color = \"Lofar_suspicious\";
+    ok=false;
   }
   else if (nrOfModules2 != dynlen(OK2))
   {
     tooltip += \"POWEC1: nrOfModules and OKArray length differ\";
     color = \"Lofar_suspicious\";
+    ok=false;
   }
   else 
   {
     tooltip += \"POWEC0: </br>\";
-    bool ok = true;
+    // PCS type controllers have 1=ok 2=error
+    int module_ok=1;    
+    
+    // new ACX type controllers have 0=ok 1=error
+    // DPT has to be extended with powerSystemType so we can be more flexible with the next check
+    if (db == \"PL610:\" || db == \"PL611:\" || db == \"PL612:\") module_ok = 0;
+        
     for (int i = 1; i <= nrOfModules1; i++)
     {
-      if (OK1[i]  != 1)
+      if (OK1[i]  != module_ok)
       {
         ok = false;
         tooltip += \"        Module [\"+i+\"] not OK </br>\";
         color = \"Lofar_broken\";
       }     
     }
-    if (ok) tooltip += \"All Modules OK <br>\";
     
-    ok = true;
     tooltip += \"POWEC1: </br>\";
     
     for (int i = 1; i <= nrOfModules2; i++)
     {
-      if (OK2[i] != 1)
+      if (OK2[i] != module_ok)
       {
         ok = false;
         tooltip += \"        Module [\"+i+\"] not OK </br>\";
         color = \"Lofar_broken\";
       }     
     }
-    if (ok) tooltip += \"All Modules OK <br>\";
   }
   
-  setValue(\"powerUnit\",\"toolTipText\",tooltip);
-  setValue(\"powerUnit\", \"backCol\", color);
-
+  if (ok) 
+  {
+    tooltip += \"All Modules OK <br>\";
+    color = \"Lofar_operational\";
+    setValue(\"powerUnit\",\"toolTipText\",tooltip);
+    setValue(\"powerUnit\", \"backCol\", color);
+  } 
+  else
+  {
+    setValue(\"powerUnit\",\"toolTipText\",tooltip);
+    setValue(\"powerUnit\", \"backCol\", color);
+  }
 }
 
 " 0
@@ -230,9 +270,11 @@ void dblClick() {
 // routine for right mouse click
 void rClick() {
 }" 0
- 2
+ 3
 "CBRef" "1"
 "EClose" E
+"dpi" "96"
+0 0 0
 ""
 DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
 LAYER, 0 
@@ -257,8 +299,9 @@ E E E
 1
 LANG:1 0 
 
-1
+2
 "dashclr"N "_Transparent"
+"antiAliased" "0"
 E "main()
 {
   click();
diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl
index bb2f74ad007f563a71aa15a0a752308848ce597d..80d9a58b9eaeae77b36bd97cc303eefe6f498824 100644
--- a/MAC/Navigator2/scripts/libs/navFunct.ctl
+++ b/MAC/Navigator2/scripts/libs/navFunct.ctl
@@ -883,7 +883,13 @@ string navFunct_dynToString (dyn_anytype aDynArray) {
 dyn_string navFunct_getDynString(dyn_dyn_anytype tab, int start,int idx) {
   dyn_string aS;
   for (int i=start; i<= dynlen(tab); i++) {
-    dynAppend(aS,tab[i][idx]);
+    if (dynAppend(aS,tab[i][idx]) == -1) {
+      err = getLastError(); //test whether an error occurred 
+      if(dynlen(err) > 0) 
+      { 
+        errorDialog(err); 
+      }
+    }
   }
   return aS;
 }
diff --git a/MAC/Navigator2/scripts/libs/navPanel.ctl b/MAC/Navigator2/scripts/libs/navPanel.ctl
index 5125f0f0208d76aca9acfa60f665395f60549df8..3757a05bd8e468352194060509ce80876ab79d60 100644
--- a/MAC/Navigator2/scripts/libs/navPanel.ctl
+++ b/MAC/Navigator2/scripts/libs/navPanel.ctl
@@ -39,12 +39,12 @@
 #uses "navigator.ctl"
 
 global string 		itsEventDp         = "";
-global string           itsActionDp        = "";
-global dyn_string 	itsSelectionDp     = "";
-global string           itsNavigatorObject = "";
-global string           sysName            = "";
+global string     itsActionDp        = "";
+global dyn_string itsSelectionDp     = "";
+global string     itsNavigatorObject = "";
+global string     sysName            = "";
 
-global string           g_craftPath        = "http://craft.astron.nl/";
+global string     g_craftPath        = "http://craft.astron.nl/";
 
 // Define pathchoices to be able to check datapaths in RCU screen
 global bool InputEnable=FALSE;
diff --git a/MAC/Tools/Rubidium/CMakeLists.txt b/MAC/Tools/Rubidium/CMakeLists.txt
index 71a2175222e29a48ba80104fdbe31770e4df7e6d..8aa8cc13cc978abbf41c21c3ce83ae60e9aaa19e 100644
--- a/MAC/Tools/Rubidium/CMakeLists.txt
+++ b/MAC/Tools/Rubidium/CMakeLists.txt
@@ -1,12 +1,12 @@
 # $Id$
 
-lofar_add_sbin_program(tci tci.c)
+#lofar_add_sbin_program(tci tci.c)
 
 lofar_add_sbin_scripts(
   plotrubidium 
   filter.py 
   rr.py 
-  rubidium_logger.py 
-  rubidium_logger_centos7.py
+#  rubidium_logger.py 
+#  rubidium_logger_centos7.py
   rlp.py)
 
diff --git a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
index 491359db3dac938df6dcc13d5b207a1af2ff7fa2..8a962bfc96886e1962265cec646ce9a695499feb 100755
--- a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
+++ b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
@@ -13,7 +13,7 @@ fi
 unset username
 
 # location of the file in the NEXUS
-NEXUS_URL=https://support.astron.nl/nexus/content/repositories/releases/nl/astron/lofar/cobalt/${RELEASE_NAME}.ztar
+NEXUS_URL=https://support.astron.nl/nexus/content/repositories/releases/nl/astron/lofar/${RELEASE_NAME}/Online_Cobalt_${RELEASE_NAME}.ztar
 if [ "${RELEASE_NAME}" = "" ]; then
   echo "ERROR: RELEASE_NAME is not set or empty. Needed to download archive to install"
   exit 1
@@ -35,10 +35,10 @@ for HOST in ${HOSTS:-cbm001 cbm002 cbm003 cbm004 cbm005 cbm006 cbm007 cbm008 cbm
 
   # The full pathnames are in the tar file, so unpack from root dir.
   # -m: don't warn on timestamping /localhome
-  cd / && tar -zxvmf \"/localhome/lofarbuild/incoming/${RELEASE_NAME}.ztar\" || exit 1
+  cd / && tar -zxvmf \"/localhome/lofarbuild/incoming/Online_Cobalt_${RELEASE_NAME}.ztar\" || exit 1
 
   # Remove tarball
-  rm \"/localhome/lofarbuild/incoming/${RELEASE_NAME}.ztar\"
+  rm \"/localhome/lofarbuild/incoming/Online_Cobalt_${RELEASE_NAME}.ztar\"
 
   # Sym link installed var/ to common location.
   cd \"/localhome/lofar/lofar_versions/${RELEASE_NAME}\" &&
diff --git a/SAS/DataManagement/Cleanup/CleanupService/service.py b/SAS/DataManagement/Cleanup/CleanupService/service.py
index 3fbcf3fdf36e03a9f00ba17ab91361fdb439b21c..ecee432fc8250291b24347a355665c7c89cafced 100644
--- a/SAS/DataManagement/Cleanup/CleanupService/service.py
+++ b/SAS/DataManagement/Cleanup/CleanupService/service.py
@@ -6,7 +6,9 @@
 import logging
 import os.path
 import socket
+import time
 import subprocess
+import time
 from datetime import datetime
 from optparse import OptionParser
 from lofar.messaging import Service
@@ -180,7 +182,7 @@ class CleanupHandler(MessageHandlerInterface):
             ingestable_dataproducts = [dp for dp in dataproducts if dp['status'] not in [None, 'has_data', 'aborted'] ]
             ingested_dataproducts = [dp for dp in dataproducts if dp['status'] == 'ingested']
 
-            if len(ingested_dataproducts) != len(dataproducts) and len(dataproducts) > 0 and len(ingestable_dataproducts) > 0:
+            if len(ingested_dataproducts) != len(ingestable_dataproducts) and len(dataproducts) > 0 and len(ingestable_dataproducts) > 0:
                 logger.info('ingestable_dataproducts: %s', ingestable_dataproducts)
                 message = "Task otdb_id=%s has un-ingested dataproducts. Not deleting data." % (task['otdb_id'],)
                 logger.error(message)
@@ -262,7 +264,7 @@ class CleanupHandler(MessageHandlerInterface):
         except Exception as e:
             logger.error(str(e))
 
-    def _removePath(self, path):
+    def _removePath(self, path, do_recurse=True):
         logger.info("Remove path: %s" % (path,))
 
         # do various sanity checking to prevent accidental deletes
@@ -303,14 +305,29 @@ class CleanupHandler(MessageHandlerInterface):
             logger.warn(message)
             return {'deleted': True, 'message': message, 'path': path}
 
-        du_result = self._sqrpc.getDiskUsageForPath(path)
+        du_result = self._sqrpc.getDiskUsageForPath(path) if do_recurse else {}
 
         if du_result.get('found'):
             logger.info("Attempting to delete %s in %s", du_result.get('disk_usage_readable', '?B'), path)
         else:
             logger.info("Attempting to delete %s", path)
 
-        self._sendNotification(subject='PathDeleting', content={'path': path, 'size': du_result.get('disk_usage', 0) })
+        if do_recurse:
+            # LustreFS on CEP4 like many small deletes better than one large tree delete
+            # so, recurse into the sub_directories,
+            # and take a small sleep in between so other processes (like observation datawriters) can access LustreFS
+            # (we've seen observation data loss when deleting large trees)
+            subdirs_result = self.path_resolver.getSubDirectories(path)
+            if subdirs_result.get('found') and subdirs_result.get('sub_directories'):
+                sub_directories = subdirs_result['sub_directories']
+
+                for subdir in sub_directories:
+                    subdir_path = os.path.join(path, subdir)
+                    self._removePath(subdir_path, do_recurse=False) #recurse only one level deep
+                    time.sleep(0.01)
+        else:
+            self._sendNotification(subject='PathDeleting', content={'path': path, 'size': du_result.get('disk_usage', 0) })
+
 
         cmd = ['rm', '-rf', path]
         hostname = socket.gethostname()
@@ -324,11 +341,15 @@ class CleanupHandler(MessageHandlerInterface):
             message = "Deleted %s in '%s'" % (du_result.get('disk_usage_readable', '?B'), path)
             logger.info(message)
 
-            self._sendNotification(subject='PathDeleted', content={'deleted': True, 'path': path, 'message':message, 'size': du_result.get('disk_usage', 0)})
+            if do_recurse:
+                #only send notification if not recursing
+                self._sendNotification(subject='PathDeleted', content={'deleted': True, 'path': path, 'message':message, 'size': du_result.get('disk_usage', 0)})
 
             return {'deleted': True, 'message': message, 'path': path, 'size': du_result.get('disk_usage', 0)}
 
-        self._sendNotification(subject='PathDeleted', content={'deleted': False, 'path': path, 'message':'Failed to delete (part of) %s' % path})
+        if do_recurse:
+            #only send notification if not recursing
+            self._sendNotification(subject='PathDeleted', content={'deleted': False, 'path': path, 'message':'Failed to delete (part of) %s' % path})
 
         #sanitize special chars
         err = err.decode('utf-8').encode('ascii', 'ignore')
@@ -338,6 +359,9 @@ class CleanupHandler(MessageHandlerInterface):
                 'message': 'Failed to delete (part of) %s' % path,
                 'path': path }
 
+
+
+
 def createService(busname=DEFAULT_BUSNAME, servicename=DEFAULT_SERVICENAME, broker=None,
                   mountpoint=CEP4_DATA_MOUNTPOINT, verbose=False,
                   radb_busname=RADB_BUSNAME, radb_servicename=RADB_SERVICENAME,
diff --git a/SAS/QPIDInfrastructure/bin/addtoQPIDDB.py b/SAS/QPIDInfrastructure/bin/addtoQPIDDB.py
index de5793a340492284d3cc9de0c54014c3f6aed1c6..c153afaeb6fe38a986c82d37683160f5e3cd86eb 100755
--- a/SAS/QPIDInfrastructure/bin/addtoQPIDDB.py
+++ b/SAS/QPIDInfrastructure/bin/addtoQPIDDB.py
@@ -13,8 +13,9 @@ if __name__ == '__main__':
     parser.add_option('-f', '--federation', dest='federation' , type='string', default=None, help='Address of the federated broker')
     parser.add_option('-q', '--queue', dest='queue', type='string', default=None, help='Name of the queue on the broker')
     parser.add_option('-e', '--exchange', dest='exchange', type='string', default=None, help='Name of the exchange on the broker')
-    parser.add_option('-k', '--routingkey', dest='routingkey', type='string', default='#', help='Federation routing key')
+    parser.add_option('-k', '--routingkey', dest='routingkey', type='string', default='#', help='(Federation) routing key')
     parser.add_option('-d', '--dynamic', dest='dynamic', action="store_true", default=False, help='Create a dynamic route')
+    parser.add_option('--bind', dest='bind', action="store_true", default=False, help='bind given exchange (with -e) to given queue (with -q) with given routing key (with -k)')
     parser.add_option_group(dbcredentials.options_group(parser, "qpidinfra"))
 
     (options, args) = parser.parse_args()
@@ -41,6 +42,18 @@ if __name__ == '__main__':
 	QPIDinfra.addexchange(options.exchange)
 	QPIDinfra.bindexchangetohost(options.exchange,options.broker)
     
+    if (options.bind):
+        if options.exchange == None or options.queue == None or options.broker == None:
+            print
+            print 'ERROR: When binding an exchange to a queue, you need to specify options: -e, -q, -k, -b'
+            print
+            parser.print_help()
+            sys.exit(1)
+
+        #queue and exchange were already added to db above.
+        #here, just add the qpid-bind link
+        QPIDinfra.bindexchangetoqueueonhost(options.exchange,options.queue,options.broker,options.routingkey)
+
     if (options.federation):
 	QPIDinfra.addhost(options.federation)
 	if (options.queue):
diff --git a/SAS/QPIDInfrastructure/bin/configQPIDfromDB.py b/SAS/QPIDInfrastructure/bin/configQPIDfromDB.py
index 6faa807dd8a2ba1be29d1f55b90d4ce3cac80cae..d8c0ba38bb5bcc023b5742e459faf72c5d18fbb8 100755
--- a/SAS/QPIDInfrastructure/bin/configQPIDfromDB.py
+++ b/SAS/QPIDInfrastructure/bin/configQPIDfromDB.py
@@ -24,10 +24,14 @@ def qpidQroute_add(settings):
     print ("qpid-route -d queue del %s %s '%s' '%s'" %(settings['tohost'],settings['fromhost'],settings['exchangename'],settings['queuename']))
     print ("qpid-route -d queue add %s %s '%s' '%s'" %(settings['tohost'],settings['fromhost'],settings['exchangename'],settings['queuename']))
 
+def qpidconfig_add_binding(settings):
+    print ("qpid-config -d -b %s bind %s %s %s" %(settings['hostname'],settings['exchangename'],settings['queuename'],settings['routingkey']))
+
 dbcreds = dbcredentials.DBCredentials().get("qpidinfra")
 QPIDinfra = qpidinfra(dbcreds)
 QPIDinfra.perqueue(qpidconfig_add_queue)
 QPIDinfra.perexchange(qpidconfig_add_topic)
 QPIDinfra.perfederationexchange(qpidroute_add)
 QPIDinfra.perfederationqueue(qpidQroute_add)
+QPIDinfra.perqpidbinding(qpidconfig_add_binding)
 
diff --git a/SAS/QPIDInfrastructure/bin/populateDB.sh b/SAS/QPIDInfrastructure/bin/populateDB.sh
index 752cacc240746bf572cd2c71e456f54bc8809910..55c1503e126e033892bb19bc6f0ef0352a69853e 100755
--- a/SAS/QPIDInfrastructure/bin/populateDB.sh
+++ b/SAS/QPIDInfrastructure/bin/populateDB.sh
@@ -36,6 +36,7 @@ if $PROD; then
   MCU=mcu001.control.lofar
   SCU=scu001.control.lofar
   SAS=sas001.control.lofar
+  LEXAR=lexar003.offline.lofar
 
   MOM_SYSTEM=lcs023.control.lofar
   MOM_INGEST=lcs029.control.lofar
@@ -49,6 +50,7 @@ else
   MCU=mcu199.control.lofar
   SCU=scu199.control.lofar
   SAS=sas099.control.lofar
+  LEXAR=lexar003.offline.lofar
 
   MOM_SYSTEM=lcs028.control.lofar
   MOM_INGEST=lcs028.control.lofar
@@ -143,6 +145,19 @@ addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.mom.bus --federation $MOM
 addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.mom.command --federation $MOM_SYSTEM
 addtoQPIDDB.py --broker $MOM_SYSTEM --exchange ${PREFIX}lofar.mom.notification --federation $SCU
 
+# -----------------------------------------
+#   Ingest
+# -----------------------------------------
+
+addtoQPIDDB.py --broker $LEXAR --exchange ${PREFIX}lofar.lta.ingest.command
+addtoQPIDDB.py --broker $LEXAR --exchange ${PREFIX}lofar.lta.ingest.notification
+addtoQPIDDB.py --broker $LEXAR --queue ${PREFIX}lofar.lta.ingest.jobs
+addtoQPIDDB.py --broker $LEXAR --queue ${PREFIX}lofar.lta.ingest.jobs.for_transfer
+addtoQPIDDB.py --broker $LEXAR --queue ${PREFIX}lofar.lta.ingest.notification.jobmanager
+addtoQPIDDB.py --broker $LEXAR --bind --exchange ${PREFIX}lofar.lta.ingest.notification --queue ${PREFIX}lofar.lta.ingest.notification.momingestadapter --routingkey LTAIngest.#
+addtoQPIDDB.py --broker $LEXAR --bind --exchange ${PREFIX}lofar.lta.ingest.notification --queue ${PREFIX}lofar.lta.ingest.notification.jobmanager --routingkey LTAIngest.#
+
+
 # -----------------------------------------
 #   ResourceAssignment
 # -----------------------------------------
@@ -156,6 +171,13 @@ addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.ssdb.notification
 addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.dm.command
 addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.dm.notification
 
+# -----------------------------------------
+#   Ingest -> ResourceAssignment
+# -----------------------------------------
+
+addtoQPIDDB.py --broker $LEXAR --exchange ${PREFIX}lofar.lta.ingest.notification --federation $SCU
+
+
 for head in head01.cep4.control.lofar
 do
   for cpu in $CEP4
diff --git a/SAS/QPIDInfrastructure/lib/QPIDDB.py b/SAS/QPIDInfrastructure/lib/QPIDDB.py
index 87019b014f55f47e276cecdf070221daf3192b45..13035da5de6393738912648adced29f8dc7319f1 100755
--- a/SAS/QPIDInfrastructure/lib/QPIDDB.py
+++ b/SAS/QPIDInfrastructure/lib/QPIDDB.py
@@ -71,6 +71,18 @@ class qpidinfra:
 	for item in ret:
 	    callback(item)
 
+    def perqpidbinding(self,callback):
+        """ Iterate over all exchange->queue bindings defined in the database.
+        """
+        ret= self.db.doquery("""SELECT h.hostname as hostname, e.exchangename as exchangename, q.queuename as queuename, subject as routingkey
+                                FROM queuelistener
+                                INNER JOIN hosts h on fromhost=h.hostid
+                                INNER JOIN exchanges e on eid=e.exchangeid
+                                INNER JOIN queues q on qid=q.queueid
+                                ;""")
+        for item in ret:
+            callback(item)
+
     def gethostid(self,hostname):
 	""" return the database id of the given hostname or 0 if non existant.
 	example:
@@ -235,6 +247,20 @@ class qpidinfra:
 	    print("Removing exchangeroute for key %s and exchange %s from host %s to host %s" %(routingkey,exchangekey,fromid,toid))
 	    self.db.docommit("delete from exchangeroutes where erouteid=%d;" %(id))
 
+    def getexchangetoqueuebinding(self,exchangeid,queueid,hostid,routingkey):
+        """ Retrieve the info on the exchange binding for the given exchangeid and queueid.
+        Returns 0 if none found.
+        """
+        ret=self.db.doquery("select * from queuelistener where eid=%s and qid=%s and fromhost=%s and subject=\'%s\';" %(exchangeid,queueid,hostid,routingkey))
+        if (ret==[]):
+            return 0
+        return ret[0]['qlistenid']
+
+    def addexchangetoqueuebinding(self,exchangeid,queueid,hostid,routingkey='#'):
+        """ Add a qpid binding from the given exchangeid to the given queueid on the broker at hostid.
+        """
+        if (self.getexchangetoqueuebinding(exchangeid,queueid,hostid,routingkey)==0):
+            self.db.docommit("insert into queuelistener (fromhost,eid,qid,subject) VALUES ( %s , %s  , %s  , \'%s\' ) ;" %(hostid,exchangeid,queueid,routingkey))
 
     def bindqueuetohost(self,queue,host):
 	""" Insert a binding in the database for queue on host.
@@ -259,6 +285,24 @@ class qpidinfra:
 	else:
 	    print("Exchange %s already binded with broker %s in database" %(exchange,host))
 
+    def bindexchangetoqueueonhost(self,exchange,queue,host,routingkey='#'):
+        """ Insert a qpid-binding in the database from an exchange to a queue on host with the given routingkey.
+        Exchange, queue and/or host will be added to the database if needed.
+        """
+        #add exchange, queue to db if needed, and hook to given host if needed.
+        self.bindexchangetohost(exchange, host)
+        self.bindqueuetohost(queue, host)
+
+        #get the id's of exchange,queue,host (the add just returns the existing id's)
+        hostid=self.addhost(host,verbose=False)
+        exchangeid=self.addexchange(exchange,verbose=False)
+        queueid=self.addqueue(queue,verbose=False)
+
+        #check if this qpid-route is already available, else add
+        if (self.getexchangetoqueuebinding(exchangeid,queueid,hostid,routingkey)==0):
+            self.addexchangetoqueuebinding(exchangeid,queueid,hostid,routingkey)
+        else:
+            print("Exchange \'%s\' to queue \'%s\' binding with routingkey \'%s\' on broker \'%s\' is already known in database" %(exchange,queue,routingkey,host))
 
     def setqueueroute(self,queuename,fromname,toname,exchange):
 	""" Insert a queue route in the database for queuename,fromname,toname,exchange.
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql
index 2a4de6458cef3e54f845ae660a5cb90731476ef3..96d9c6941477f82208ba1630f2958a8b7de220c7 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql
@@ -142,7 +142,7 @@ ALTER TABLE resource_allocation.specification
   OWNER TO resourceassignment;
 
 CREATE INDEX specification_cluster_idx
-  ON resource_allocation.specification;
+  ON resource_allocation.specification (cluster);
 
 CREATE INDEX specification_starttime_endtime_idx
   ON resource_allocation.specification (starttime DESC, endtime);
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
index 53806d97769971b4e310ba3dc66eccc9c1986ff0..4561bf260c17b88b9833623ad67e6c336296420d 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
@@ -103,7 +103,7 @@ def updateTaskMomDetails(task, momrpc):
                             elif dp['status'] == 'on_hold':
                                 num_ingest_hold += 1
 
-                        if num_ingested == len(dps):
+                        if num_ingested == len([dp for dp in dps if dp['status'] != 'has_data']):
                             t['ingest_status'] = 'ingested'
                         elif num_ingest_pending + num_ingest_running > 0:
                             t['ingest_status'] = 'ingesting'
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py
index 5ed623359804a11debbb2fd5abb0d338cac04e55..6971176f18c64477410bb6c6eba1d2f18b2da1e7 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py
@@ -69,8 +69,6 @@ def updateTaskStorageDetails(tasks, sqrpc, curpc):
     try:
         if curpc:
             pinned_statuses = curpc.getPinnedStatuses()
-            logger.info(pinned_statuses)
-            logger.info(type(pinned_statuses.keys()[0]))
 
             for task in tasks:
                 otdb_id = int(task['otdb_id'])
diff --git a/SAS/XML_generator/src/xmlgen.py b/SAS/XML_generator/src/xmlgen.py
index f19b2a16435ffebeb350994df635a1abc85892ee..c69821055963ae3a1f0680c1d989d771401418d4 100755
--- a/SAS/XML_generator/src/xmlgen.py
+++ b/SAS/XML_generator/src/xmlgen.py
@@ -275,17 +275,6 @@ def hasCoherentTab(TAB):
 def processingCluster(cluster, number_of_tasks):
   if not number_of_tasks:
       number_of_tasks = 24
-  CEP2 = r"""  <processingCluster>
-                    <name>CEP2</name>
-                    <partition>cpu</partition>
-                    <numberOfTasks>%i</numberOfTasks>
-                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
-                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
-                    <maxDurationPerTask>PT600S</maxDurationPerTask>
-                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
-                    <runSimultaneous>true</runSimultaneous>
-                  </processingCluster>"""
-
   CEP4 = r"""  <processingCluster>
                     <name>CEP4</name>
                     <partition>cpu</partition>
@@ -297,26 +286,22 @@ def processingCluster(cluster, number_of_tasks):
                     <runSimultaneous>true</runSimultaneous>
                   </processingCluster>"""
 
-  if cluster == "CEP4":
+  if cluster in ["", "CEP4"]:
     result = CEP4 % (number_of_tasks,)
   else:
-    result = r"" #CEP2 % (number_of_tasks,)
+    raise GenException("Unknown cluster specified: %s" % cluster)
   return result
 
 def dataProductCluster(cluster):
-  CEP2 = r"""  <storageCluster>
-                      <name>CEP2</name>
-                      <partition>/data</partition>
-                    </storageCluster>"""
   CEP4 = r"""<storageCluster>
                       <name>CEP4</name>
                       <partition>/data/projects/</partition>
                     </storageCluster>"""
 
-  if cluster == "CEP4":
+  if cluster in ["", "CEP4"]:
     result = CEP4
   else:
-    result = r"" #CEP2
+    raise GenException("Unknown cluster specified: %s" % cluster)
   return result
 
 def writeXMLObs(ofile, name, descr, topo, predecessor_topo, attrname, projname, TBBpiggyBack, aartfaacPiggyBack, cordata, cohdata, incohdata, antenna, clock, instrfilt, interval, channels,
@@ -2248,7 +2233,7 @@ def writeBlock(ofile, settings, projectName, blockNr, status, nr_nodes):
   "tbbPiggybackAllowed":True,
   "aartfaacPiggybackAllowed":True,
   "imagingBBS": '',
-  "cluster":'CEP2'}
+  "cluster":'CEP4'}
   defaults.update(settings) #FIXME somewhat dirty hack, to be solved better later.
   settings = defaults
   if 'nr_nodes' in settings:  # We can set a (different) number per BLOCK
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/20150713_4C17.31.xml b/SAS/XML_generator/test/test_regression.in_data/xml/20150713_4C17.31.xml
index dfb4e6c063e79316bc6f4a5f99a07cea2ef9bff3..617d219be870445198f6abe503fcd8de1277db88 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/20150713_4C17.31.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/20150713_4C17.31.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_035</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -147,7 +150,10 @@
                     <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>   
@@ -188,7 +194,10 @@
                     <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>   
@@ -206,6 +215,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -232,7 +251,10 @@
                       <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>
                 </resultDataProducts>
@@ -247,6 +269,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -273,7 +305,10 @@
                       <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>
                 </resultDataProducts>
@@ -288,6 +323,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -314,7 +359,10 @@
                       <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>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/20150731_G46_run1_HBA.xml b/SAS/XML_generator/test/test_regression.in_data/xml/20150731_G46_run1_HBA.xml
index 8b09fad7aa9a6d3b89f00a1a55b625531d65e81d..42b7547aee6a1db6317770a225229635e6442fd0 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/20150731_G46_run1_HBA.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/20150731_G46_run1_HBA.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_010</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -147,7 +150,10 @@
                     <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>   
@@ -165,6 +171,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -191,7 +207,10 @@
                       <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>
                 </resultDataProducts>
@@ -206,6 +225,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -232,7 +261,10 @@
                       <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>
                 </resultDataProducts>
@@ -336,7 +368,10 @@
                     <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>   
@@ -377,7 +412,10 @@
                     <name>B1.1.T.SAP001.uv.dps</name>
                     <topology>B1.1.T.SAP001.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -418,7 +456,10 @@
                     <name>B1.1.T.SAP002.uv.dps</name>
                     <topology>B1.1.T.SAP002.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -436,6 +477,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -462,7 +513,10 @@
                       <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>
@@ -477,6 +531,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -503,7 +567,10 @@
                       <name>B1.1.PT1.uv.dps</name>
                       <topology>B1.1.PT1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -518,6 +585,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -544,7 +621,10 @@
                       <name>B1.1.PT2.uv.dps</name>
                       <topology>B1.1.PT2.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -648,7 +728,10 @@
                     <name>B2.1.T.SAP000.uv.dps</name>
                     <topology>B2.1.T.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -689,7 +772,10 @@
                     <name>B2.1.T.SAP001.uv.dps</name>
                     <topology>B2.1.T.SAP001.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -707,6 +793,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -733,7 +829,10 @@
                       <name>B2.1.PT0.uv.dps</name>
                       <topology>B2.1.PT0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -748,6 +847,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -774,7 +883,10 @@
                       <name>B2.1.PT1.uv.dps</name>
                       <topology>B2.1.PT1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/20150810_P247P244.xml b/SAS/XML_generator/test/test_regression.in_data/xml/20150810_P247P244.xml
index fa355b1fccfa3e2c9530c66e4cb13b45680ec73e..36927a1a3908c0444588c071468b1605ae19cd3e 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/20150810_P247P244.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/20150810_P247P244.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_034</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -124,6 +127,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -150,7 +163,10 @@
                       <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>
                 </resultDataProducts>
@@ -254,7 +270,10 @@
                     <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>   
@@ -295,7 +314,10 @@
                     <name>B1.1.T.SAP001.uv.dps</name>
                     <topology>B1.1.T.SAP001.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -313,6 +335,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -339,7 +371,10 @@
                       <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>
@@ -354,6 +389,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -380,7 +425,10 @@
                       <name>B1.1.PT1.uv.dps</name>
                       <topology>B1.1.PT1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -484,7 +532,10 @@
                     <name>B2.1.T.SAP000.uv.dps</name>
                     <topology>B2.1.T.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -502,6 +553,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -528,7 +589,10 @@
                       <name>B2.1.PT0.uv.dps</name>
                       <topology>B2.1.PT0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/2MASS_1.xml b/SAS/XML_generator/test/test_regression.in_data/xml/2MASS_1.xml
index 48748015e367f985e492824cd73aa3ccbead8557..96c89097f95765ce834c5d9912a3598732e09c92 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/2MASS_1.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/2MASS_1.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_031</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -124,6 +127,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -150,7 +163,10 @@
                       <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>
@@ -245,7 +261,10 @@
                     <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>   
@@ -263,6 +282,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -289,7 +318,10 @@
                       <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>
                 </resultDataProducts>
@@ -393,7 +425,10 @@
                     <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>   
@@ -411,6 +446,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -437,7 +482,10 @@
                       <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>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/B1834620_HBA_LB_20150817.xml b/SAS/XML_generator/test/test_regression.in_data/xml/B1834620_HBA_LB_20150817.xml
index 8674017037e3abaad1b0f15022c5c956eedc1fff..49b211cb01b27aa9841af34573e035a2f35f5df1 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/B1834620_HBA_LB_20150817.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/B1834620_HBA_LB_20150817.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>Commissioning2015</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -124,6 +127,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -160,7 +173,10 @@
                       <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>
@@ -168,7 +184,10 @@
                       <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>
@@ -263,7 +282,10 @@
                     <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>   
@@ -304,7 +326,10 @@
                     <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>   
@@ -322,6 +347,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -363,7 +398,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -378,6 +416,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -419,7 +467,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -434,6 +485,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -460,7 +521,10 @@
                       <name>B0.1.PTLB0.uv.dps</name>
                       <topology>B0.1.PTLB0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -475,6 +539,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1000</duration>
@@ -493,7 +567,10 @@
                       <name>B0.1.LBP0.uv.dps</name>
                       <topology>B0.1.LBP0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -508,6 +585,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -534,7 +621,10 @@
                       <name>B0.1.PTLB1.uv.dps</name>
                       <topology>B0.1.PTLB1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -549,6 +639,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1000</duration>
@@ -567,7 +667,10 @@
                       <name>B0.1.LBP1.uv.dps</name>
                       <topology>B0.1.LBP1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -662,7 +765,10 @@
                     <name>B0.2.C.SAP000.uv.dps</name>
                     <topology>B0.2.C.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -680,6 +786,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -716,7 +832,10 @@
                       <name>B0.2.CPC.inst.dps</name>
                       <topology>B0.2.CPC.inst.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:instrumentModelDataProduct>
                   </item>
                   <item>
@@ -724,7 +843,10 @@
                       <name>B0.2.CPC.uv.dps</name>
                       <topology>B0.2.CPC.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -819,7 +941,10 @@
                     <name>B0.2.T.SAP000.uv.dps</name>
                     <topology>B0.2.T.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -860,7 +985,10 @@
                     <name>B0.2.T.SAP001.uv.dps</name>
                     <topology>B0.2.T.SAP001.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -878,6 +1006,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -919,7 +1057,10 @@
                             <name>B0.2.PT0.uv.dps</name>
                             <topology>B0.2.PT0.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -934,6 +1075,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -975,7 +1126,10 @@
                             <name>B0.2.PT1.uv.dps</name>
                             <topology>B0.2.PT1.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -990,6 +1144,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -1016,7 +1180,10 @@
                       <name>B0.2.PTLB0.uv.dps</name>
                       <topology>B0.2.PTLB0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -1031,6 +1198,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1000</duration>
@@ -1049,7 +1226,10 @@
                       <name>B0.2.LBP0.uv.dps</name>
                       <topology>B0.2.LBP0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -1064,6 +1244,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -1090,7 +1280,10 @@
                       <name>B0.2.PTLB1.uv.dps</name>
                       <topology>B0.2.PTLB1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -1105,6 +1298,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1000</duration>
@@ -1123,7 +1326,10 @@
                       <name>B0.2.LBP1.uv.dps</name>
                       <topology>B0.2.LBP1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/LC4_020_20150813.xml b/SAS/XML_generator/test/test_regression.in_data/xml/LC4_020_20150813.xml
index 82261ecdbcff1d85324709a922206b76ccf18afb..0f0581df78659a73844c03dd179c699df442a532 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/LC4_020_20150813.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/LC4_020_20150813.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_020</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -147,7 +150,10 @@
                     <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>   
@@ -165,6 +171,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -191,7 +207,10 @@
                       <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>
@@ -206,6 +225,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -232,7 +261,10 @@
                       <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>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/LC4_022_3C58_HBA_parameters.xml b/SAS/XML_generator/test/test_regression.in_data/xml/LC4_022_3C58_HBA_parameters.xml
index c6458febe016945069b3bf2bd107f3584b524172..7cbc96cf67509787e1ec77ce1a73f3a90c6cae1a 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/LC4_022_3C58_HBA_parameters.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/LC4_022_3C58_HBA_parameters.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_022</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -124,6 +127,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -160,7 +173,10 @@
                       <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>
@@ -168,7 +184,10 @@
                       <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>
@@ -263,7 +282,10 @@
                     <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>   
@@ -281,6 +303,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -322,7 +354,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -337,7 +372,17 @@
           <currentStatus>
             <mom2:openedStatus/>
           </currentStatus>
-          <imagingPipelineAttributes>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
+                <imagingPipelineAttributes>
             <defaultTemplate>Imaging Pipeline HBA</defaultTemplate>
             <duration></duration>
             <nrOfOutputSkyImage>12</nrOfOutputSkyImage>
@@ -369,7 +414,10 @@
                       <name>B0.PI0.dps</name>
                       <topology>B0.PI0.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:skyImageDataProduct>
                   </item>
                 </resultDataProducts>
@@ -473,7 +521,10 @@
                     <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>   
@@ -491,6 +542,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -517,7 +578,10 @@
                       <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>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/LT5_006_4C43_HBA_calSearch_parameters.xml b/SAS/XML_generator/test/test_regression.in_data/xml/LT5_006_4C43_HBA_calSearch_parameters.xml
index 54d5e0696582e4624e7e265d8e2dcfa1f1c57513..c8e1bc3b9f46f38d843922115de90f5b2cb97f02 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/LT5_006_4C43_HBA_calSearch_parameters.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/LT5_006_4C43_HBA_calSearch_parameters.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LT5_006</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -124,6 +127,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -160,7 +173,10 @@
                       <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>
@@ -168,7 +184,10 @@
                       <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>
@@ -263,7 +282,10 @@
                     <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>   
@@ -304,7 +326,10 @@
                     <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>   
@@ -345,7 +370,10 @@
                     <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>   
@@ -386,7 +414,10 @@
                     <name>B0.1.T.SAP003.uv.dps</name>
                     <topology>B0.1.T.SAP003.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -427,7 +458,10 @@
                     <name>B0.1.T.SAP004.uv.dps</name>
                     <topology>B0.1.T.SAP004.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -468,7 +502,10 @@
                     <name>B0.1.T.SAP005.uv.dps</name>
                     <topology>B0.1.T.SAP005.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -509,7 +546,10 @@
                     <name>B0.1.T.SAP006.uv.dps</name>
                     <topology>B0.1.T.SAP006.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -550,7 +590,10 @@
                     <name>B0.1.T.SAP007.uv.dps</name>
                     <topology>B0.1.T.SAP007.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -591,7 +634,10 @@
                     <name>B0.1.T.SAP008.uv.dps</name>
                     <topology>B0.1.T.SAP008.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -632,7 +678,10 @@
                     <name>B0.1.T.SAP009.uv.dps</name>
                     <topology>B0.1.T.SAP009.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -673,7 +722,10 @@
                     <name>B0.1.T.SAP010.uv.dps</name>
                     <topology>B0.1.T.SAP010.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -714,7 +766,10 @@
                     <name>B0.1.T.SAP011.uv.dps</name>
                     <topology>B0.1.T.SAP011.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -755,7 +810,10 @@
                     <name>B0.1.T.SAP012.uv.dps</name>
                     <topology>B0.1.T.SAP012.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -796,7 +854,10 @@
                     <name>B0.1.T.SAP013.uv.dps</name>
                     <topology>B0.1.T.SAP013.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -837,7 +898,10 @@
                     <name>B0.1.T.SAP014.uv.dps</name>
                     <topology>B0.1.T.SAP014.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -878,7 +942,10 @@
                     <name>B0.1.T.SAP015.uv.dps</name>
                     <topology>B0.1.T.SAP015.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -919,7 +986,10 @@
                     <name>B0.1.T.SAP016.uv.dps</name>
                     <topology>B0.1.T.SAP016.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -960,7 +1030,10 @@
                     <name>B0.1.T.SAP017.uv.dps</name>
                     <topology>B0.1.T.SAP017.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1001,7 +1074,10 @@
                     <name>B0.1.T.SAP018.uv.dps</name>
                     <topology>B0.1.T.SAP018.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1042,7 +1118,10 @@
                     <name>B0.1.T.SAP019.uv.dps</name>
                     <topology>B0.1.T.SAP019.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1083,7 +1162,10 @@
                     <name>B0.1.T.SAP020.uv.dps</name>
                     <topology>B0.1.T.SAP020.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1124,7 +1206,10 @@
                     <name>B0.1.T.SAP021.uv.dps</name>
                     <topology>B0.1.T.SAP021.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1165,7 +1250,10 @@
                     <name>B0.1.T.SAP022.uv.dps</name>
                     <topology>B0.1.T.SAP022.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1206,7 +1294,10 @@
                     <name>B0.1.T.SAP023.uv.dps</name>
                     <topology>B0.1.T.SAP023.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1247,7 +1338,10 @@
                     <name>B0.1.T.SAP024.uv.dps</name>
                     <topology>B0.1.T.SAP024.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1288,7 +1382,10 @@
                     <name>B0.1.T.SAP025.uv.dps</name>
                     <topology>B0.1.T.SAP025.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1329,7 +1426,10 @@
                     <name>B0.1.T.SAP026.uv.dps</name>
                     <topology>B0.1.T.SAP026.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1370,7 +1470,10 @@
                     <name>B0.1.T.SAP027.uv.dps</name>
                     <topology>B0.1.T.SAP027.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1411,7 +1514,10 @@
                     <name>B0.1.T.SAP028.uv.dps</name>
                     <topology>B0.1.T.SAP028.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1452,7 +1558,10 @@
                     <name>B0.1.T.SAP029.uv.dps</name>
                     <topology>B0.1.T.SAP029.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1493,7 +1602,10 @@
                     <name>B0.1.T.SAP030.uv.dps</name>
                     <topology>B0.1.T.SAP030.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1534,7 +1646,10 @@
                     <name>B0.1.T.SAP031.uv.dps</name>
                     <topology>B0.1.T.SAP031.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1575,7 +1690,10 @@
                     <name>B0.1.T.SAP032.uv.dps</name>
                     <topology>B0.1.T.SAP032.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1616,7 +1734,10 @@
                     <name>B0.1.T.SAP033.uv.dps</name>
                     <topology>B0.1.T.SAP033.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1657,7 +1778,10 @@
                     <name>B0.1.T.SAP034.uv.dps</name>
                     <topology>B0.1.T.SAP034.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1698,7 +1822,10 @@
                     <name>B0.1.T.SAP035.uv.dps</name>
                     <topology>B0.1.T.SAP035.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1739,7 +1866,10 @@
                     <name>B0.1.T.SAP036.uv.dps</name>
                     <topology>B0.1.T.SAP036.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1780,7 +1910,10 @@
                     <name>B0.1.T.SAP037.uv.dps</name>
                     <topology>B0.1.T.SAP037.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1821,7 +1954,10 @@
                     <name>B0.1.T.SAP038.uv.dps</name>
                     <topology>B0.1.T.SAP038.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1862,7 +1998,10 @@
                     <name>B0.1.T.SAP039.uv.dps</name>
                     <topology>B0.1.T.SAP039.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1903,7 +2042,10 @@
                     <name>B0.1.T.SAP040.uv.dps</name>
                     <topology>B0.1.T.SAP040.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1944,7 +2086,10 @@
                     <name>B0.1.T.SAP041.uv.dps</name>
                     <topology>B0.1.T.SAP041.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1985,7 +2130,10 @@
                     <name>B0.1.T.SAP042.uv.dps</name>
                     <topology>B0.1.T.SAP042.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2026,7 +2174,10 @@
                     <name>B0.1.T.SAP043.uv.dps</name>
                     <topology>B0.1.T.SAP043.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2067,7 +2218,10 @@
                     <name>B0.1.T.SAP044.uv.dps</name>
                     <topology>B0.1.T.SAP044.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2108,7 +2262,10 @@
                     <name>B0.1.T.SAP045.uv.dps</name>
                     <topology>B0.1.T.SAP045.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2149,7 +2306,10 @@
                     <name>B0.1.T.SAP046.uv.dps</name>
                     <topology>B0.1.T.SAP046.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2190,7 +2350,10 @@
                     <name>B0.1.T.SAP047.uv.dps</name>
                     <topology>B0.1.T.SAP047.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2231,7 +2394,10 @@
                     <name>B0.1.T.SAP048.uv.dps</name>
                     <topology>B0.1.T.SAP048.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2272,7 +2438,10 @@
                     <name>B0.1.T.SAP049.uv.dps</name>
                     <topology>B0.1.T.SAP049.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2313,7 +2482,10 @@
                     <name>B0.1.T.SAP050.uv.dps</name>
                     <topology>B0.1.T.SAP050.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2354,7 +2526,10 @@
                     <name>B0.1.T.SAP051.uv.dps</name>
                     <topology>B0.1.T.SAP051.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2395,7 +2570,10 @@
                     <name>B0.1.T.SAP052.uv.dps</name>
                     <topology>B0.1.T.SAP052.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2436,7 +2614,10 @@
                     <name>B0.1.T.SAP053.uv.dps</name>
                     <topology>B0.1.T.SAP053.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2477,7 +2658,10 @@
                     <name>B0.1.T.SAP054.uv.dps</name>
                     <topology>B0.1.T.SAP054.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2518,7 +2702,10 @@
                     <name>B0.1.T.SAP055.uv.dps</name>
                     <topology>B0.1.T.SAP055.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2559,7 +2746,10 @@
                     <name>B0.1.T.SAP056.uv.dps</name>
                     <topology>B0.1.T.SAP056.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2600,7 +2790,10 @@
                     <name>B0.1.T.SAP057.uv.dps</name>
                     <topology>B0.1.T.SAP057.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2641,7 +2834,10 @@
                     <name>B0.1.T.SAP058.uv.dps</name>
                     <topology>B0.1.T.SAP058.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2682,7 +2878,10 @@
                     <name>B0.1.T.SAP059.uv.dps</name>
                     <topology>B0.1.T.SAP059.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2723,7 +2922,10 @@
                     <name>B0.1.T.SAP060.uv.dps</name>
                     <topology>B0.1.T.SAP060.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -2741,6 +2943,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -2782,7 +2994,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -2797,6 +3012,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -2838,7 +3063,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -2853,6 +3081,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -2894,7 +3132,10 @@
                             <name>B0.1.PT3.uv.dps</name>
                             <topology>B0.1.PT3.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -2909,6 +3150,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -2950,7 +3201,10 @@
                             <name>B0.1.PT4.uv.dps</name>
                             <topology>B0.1.PT4.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -2965,6 +3219,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3006,7 +3270,10 @@
                             <name>B0.1.PT5.uv.dps</name>
                             <topology>B0.1.PT5.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3021,6 +3288,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3062,7 +3339,10 @@
                             <name>B0.1.PT6.uv.dps</name>
                             <topology>B0.1.PT6.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3077,6 +3357,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3118,7 +3408,10 @@
                             <name>B0.1.PT7.uv.dps</name>
                             <topology>B0.1.PT7.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3133,6 +3426,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3174,7 +3477,10 @@
                             <name>B0.1.PT8.uv.dps</name>
                             <topology>B0.1.PT8.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3189,6 +3495,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3230,7 +3546,10 @@
                             <name>B0.1.PT9.uv.dps</name>
                             <topology>B0.1.PT9.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3245,6 +3564,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3286,7 +3615,10 @@
                             <name>B0.1.PT10.uv.dps</name>
                             <topology>B0.1.PT10.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3301,6 +3633,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3342,7 +3684,10 @@
                             <name>B0.1.PT11.uv.dps</name>
                             <topology>B0.1.PT11.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3357,6 +3702,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3398,7 +3753,10 @@
                             <name>B0.1.PT12.uv.dps</name>
                             <topology>B0.1.PT12.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3413,6 +3771,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3454,7 +3822,10 @@
                             <name>B0.1.PT13.uv.dps</name>
                             <topology>B0.1.PT13.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3469,6 +3840,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3510,7 +3891,10 @@
                             <name>B0.1.PT14.uv.dps</name>
                             <topology>B0.1.PT14.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3525,6 +3909,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3566,7 +3960,10 @@
                             <name>B0.1.PT15.uv.dps</name>
                             <topology>B0.1.PT15.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3581,6 +3978,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3622,7 +4029,10 @@
                             <name>B0.1.PT16.uv.dps</name>
                             <topology>B0.1.PT16.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3637,6 +4047,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3678,7 +4098,10 @@
                             <name>B0.1.PT17.uv.dps</name>
                             <topology>B0.1.PT17.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3693,6 +4116,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3734,7 +4167,10 @@
                             <name>B0.1.PT18.uv.dps</name>
                             <topology>B0.1.PT18.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3749,6 +4185,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3790,7 +4236,10 @@
                             <name>B0.1.PT19.uv.dps</name>
                             <topology>B0.1.PT19.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3805,6 +4254,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3846,7 +4305,10 @@
                             <name>B0.1.PT20.uv.dps</name>
                             <topology>B0.1.PT20.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3861,6 +4323,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3902,7 +4374,10 @@
                             <name>B0.1.PT21.uv.dps</name>
                             <topology>B0.1.PT21.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3917,6 +4392,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -3958,7 +4443,10 @@
                             <name>B0.1.PT22.uv.dps</name>
                             <topology>B0.1.PT22.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -3973,6 +4461,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4014,7 +4512,10 @@
                             <name>B0.1.PT23.uv.dps</name>
                             <topology>B0.1.PT23.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4029,6 +4530,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4070,7 +4581,10 @@
                             <name>B0.1.PT24.uv.dps</name>
                             <topology>B0.1.PT24.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4085,6 +4599,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4126,7 +4650,10 @@
                             <name>B0.1.PT25.uv.dps</name>
                             <topology>B0.1.PT25.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4141,6 +4668,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4182,7 +4719,10 @@
                             <name>B0.1.PT26.uv.dps</name>
                             <topology>B0.1.PT26.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4197,6 +4737,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4238,7 +4788,10 @@
                             <name>B0.1.PT27.uv.dps</name>
                             <topology>B0.1.PT27.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4253,6 +4806,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4294,7 +4857,10 @@
                             <name>B0.1.PT28.uv.dps</name>
                             <topology>B0.1.PT28.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4309,6 +4875,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4350,7 +4926,10 @@
                             <name>B0.1.PT29.uv.dps</name>
                             <topology>B0.1.PT29.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4365,6 +4944,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4406,7 +4995,10 @@
                             <name>B0.1.PT30.uv.dps</name>
                             <topology>B0.1.PT30.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4421,6 +5013,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4462,7 +5064,10 @@
                             <name>B0.1.PT31.uv.dps</name>
                             <topology>B0.1.PT31.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4477,6 +5082,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4518,7 +5133,10 @@
                             <name>B0.1.PT32.uv.dps</name>
                             <topology>B0.1.PT32.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4533,6 +5151,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4574,7 +5202,10 @@
                             <name>B0.1.PT33.uv.dps</name>
                             <topology>B0.1.PT33.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4589,6 +5220,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4630,7 +5271,10 @@
                             <name>B0.1.PT34.uv.dps</name>
                             <topology>B0.1.PT34.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4645,6 +5289,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4686,7 +5340,10 @@
                             <name>B0.1.PT35.uv.dps</name>
                             <topology>B0.1.PT35.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4701,6 +5358,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4742,7 +5409,10 @@
                             <name>B0.1.PT36.uv.dps</name>
                             <topology>B0.1.PT36.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4757,6 +5427,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4798,7 +5478,10 @@
                             <name>B0.1.PT37.uv.dps</name>
                             <topology>B0.1.PT37.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4813,6 +5496,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4854,7 +5547,10 @@
                             <name>B0.1.PT38.uv.dps</name>
                             <topology>B0.1.PT38.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4869,6 +5565,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4910,7 +5616,10 @@
                             <name>B0.1.PT39.uv.dps</name>
                             <topology>B0.1.PT39.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4925,6 +5634,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -4966,7 +5685,10 @@
                             <name>B0.1.PT40.uv.dps</name>
                             <topology>B0.1.PT40.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -4981,6 +5703,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5022,7 +5754,10 @@
                             <name>B0.1.PT41.uv.dps</name>
                             <topology>B0.1.PT41.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5037,6 +5772,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5078,7 +5823,10 @@
                             <name>B0.1.PT42.uv.dps</name>
                             <topology>B0.1.PT42.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5093,6 +5841,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5134,7 +5892,10 @@
                             <name>B0.1.PT43.uv.dps</name>
                             <topology>B0.1.PT43.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5149,6 +5910,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5190,7 +5961,10 @@
                             <name>B0.1.PT44.uv.dps</name>
                             <topology>B0.1.PT44.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5205,6 +5979,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5246,7 +6030,10 @@
                             <name>B0.1.PT45.uv.dps</name>
                             <topology>B0.1.PT45.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5261,6 +6048,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5302,7 +6099,10 @@
                             <name>B0.1.PT46.uv.dps</name>
                             <topology>B0.1.PT46.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5317,6 +6117,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5358,7 +6168,10 @@
                             <name>B0.1.PT47.uv.dps</name>
                             <topology>B0.1.PT47.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5373,6 +6186,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5414,7 +6237,10 @@
                             <name>B0.1.PT48.uv.dps</name>
                             <topology>B0.1.PT48.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5429,6 +6255,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5470,7 +6306,10 @@
                             <name>B0.1.PT49.uv.dps</name>
                             <topology>B0.1.PT49.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5485,6 +6324,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5526,7 +6375,10 @@
                             <name>B0.1.PT50.uv.dps</name>
                             <topology>B0.1.PT50.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5541,6 +6393,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5582,7 +6444,10 @@
                             <name>B0.1.PT51.uv.dps</name>
                             <topology>B0.1.PT51.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5597,6 +6462,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5638,7 +6513,10 @@
                             <name>B0.1.PT52.uv.dps</name>
                             <topology>B0.1.PT52.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5653,6 +6531,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5694,7 +6582,10 @@
                             <name>B0.1.PT53.uv.dps</name>
                             <topology>B0.1.PT53.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5709,6 +6600,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5750,7 +6651,10 @@
                             <name>B0.1.PT54.uv.dps</name>
                             <topology>B0.1.PT54.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5765,6 +6669,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5806,7 +6720,10 @@
                             <name>B0.1.PT55.uv.dps</name>
                             <topology>B0.1.PT55.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5821,6 +6738,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5862,7 +6789,10 @@
                             <name>B0.1.PT56.uv.dps</name>
                             <topology>B0.1.PT56.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5877,6 +6807,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5918,7 +6858,10 @@
                             <name>B0.1.PT57.uv.dps</name>
                             <topology>B0.1.PT57.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5933,6 +6876,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -5974,7 +6927,10 @@
                             <name>B0.1.PT58.uv.dps</name>
                             <topology>B0.1.PT58.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -5989,6 +6945,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6030,7 +6996,10 @@
                             <name>B0.1.PT59.uv.dps</name>
                             <topology>B0.1.PT59.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -6045,6 +7014,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6086,7 +7065,10 @@
                             <name>B0.1.PT60.uv.dps</name>
                             <topology>B0.1.PT60.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -6101,6 +7083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6127,7 +7119,10 @@
                       <name>B0.1.PTLB1.uv.dps</name>
                       <topology>B0.1.PTLB1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6142,6 +7137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6160,7 +7165,10 @@
                       <name>B0.1.LBP1.uv.dps</name>
                       <topology>B0.1.LBP1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6175,6 +7183,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6201,7 +7219,10 @@
                       <name>B0.1.PTLB2.uv.dps</name>
                       <topology>B0.1.PTLB2.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6216,6 +7237,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6234,7 +7265,10 @@
                       <name>B0.1.LBP2.uv.dps</name>
                       <topology>B0.1.LBP2.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6249,6 +7283,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6275,7 +7319,10 @@
                       <name>B0.1.PTLB3.uv.dps</name>
                       <topology>B0.1.PTLB3.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6290,6 +7337,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6308,7 +7365,10 @@
                       <name>B0.1.LBP3.uv.dps</name>
                       <topology>B0.1.LBP3.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6323,6 +7383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6349,7 +7419,10 @@
                       <name>B0.1.PTLB4.uv.dps</name>
                       <topology>B0.1.PTLB4.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6364,6 +7437,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6382,7 +7465,10 @@
                       <name>B0.1.LBP4.uv.dps</name>
                       <topology>B0.1.LBP4.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6397,6 +7483,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6423,7 +7519,10 @@
                       <name>B0.1.PTLB5.uv.dps</name>
                       <topology>B0.1.PTLB5.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6438,6 +7537,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6456,7 +7565,10 @@
                       <name>B0.1.LBP5.uv.dps</name>
                       <topology>B0.1.LBP5.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6471,6 +7583,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6497,7 +7619,10 @@
                       <name>B0.1.PTLB6.uv.dps</name>
                       <topology>B0.1.PTLB6.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6512,6 +7637,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6530,7 +7665,10 @@
                       <name>B0.1.LBP6.uv.dps</name>
                       <topology>B0.1.LBP6.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6545,6 +7683,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6571,7 +7719,10 @@
                       <name>B0.1.PTLB7.uv.dps</name>
                       <topology>B0.1.PTLB7.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6586,6 +7737,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6604,7 +7765,10 @@
                       <name>B0.1.LBP7.uv.dps</name>
                       <topology>B0.1.LBP7.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6619,6 +7783,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6645,7 +7819,10 @@
                       <name>B0.1.PTLB8.uv.dps</name>
                       <topology>B0.1.PTLB8.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6660,6 +7837,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6678,7 +7865,10 @@
                       <name>B0.1.LBP8.uv.dps</name>
                       <topology>B0.1.LBP8.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6693,6 +7883,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6719,7 +7919,10 @@
                       <name>B0.1.PTLB9.uv.dps</name>
                       <topology>B0.1.PTLB9.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6734,6 +7937,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6752,7 +7965,10 @@
                       <name>B0.1.LBP9.uv.dps</name>
                       <topology>B0.1.LBP9.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6767,6 +7983,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6793,7 +8019,10 @@
                       <name>B0.1.PTLB10.uv.dps</name>
                       <topology>B0.1.PTLB10.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6808,6 +8037,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6826,7 +8065,10 @@
                       <name>B0.1.LBP10.uv.dps</name>
                       <topology>B0.1.LBP10.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6841,6 +8083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6867,7 +8119,10 @@
                       <name>B0.1.PTLB11.uv.dps</name>
                       <topology>B0.1.PTLB11.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6882,6 +8137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6900,7 +8165,10 @@
                       <name>B0.1.LBP11.uv.dps</name>
                       <topology>B0.1.LBP11.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6915,6 +8183,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -6941,7 +8219,10 @@
                       <name>B0.1.PTLB12.uv.dps</name>
                       <topology>B0.1.PTLB12.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6956,6 +8237,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -6974,7 +8265,10 @@
                       <name>B0.1.LBP12.uv.dps</name>
                       <topology>B0.1.LBP12.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -6989,6 +8283,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7015,7 +8319,10 @@
                       <name>B0.1.PTLB13.uv.dps</name>
                       <topology>B0.1.PTLB13.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7030,6 +8337,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7048,7 +8365,10 @@
                       <name>B0.1.LBP13.uv.dps</name>
                       <topology>B0.1.LBP13.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7063,6 +8383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7089,7 +8419,10 @@
                       <name>B0.1.PTLB14.uv.dps</name>
                       <topology>B0.1.PTLB14.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7104,6 +8437,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7122,7 +8465,10 @@
                       <name>B0.1.LBP14.uv.dps</name>
                       <topology>B0.1.LBP14.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7137,6 +8483,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7163,7 +8519,10 @@
                       <name>B0.1.PTLB15.uv.dps</name>
                       <topology>B0.1.PTLB15.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7178,6 +8537,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7196,7 +8565,10 @@
                       <name>B0.1.LBP15.uv.dps</name>
                       <topology>B0.1.LBP15.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7211,6 +8583,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7237,7 +8619,10 @@
                       <name>B0.1.PTLB16.uv.dps</name>
                       <topology>B0.1.PTLB16.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7252,6 +8637,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7270,7 +8665,10 @@
                       <name>B0.1.LBP16.uv.dps</name>
                       <topology>B0.1.LBP16.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7285,6 +8683,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7311,7 +8719,10 @@
                       <name>B0.1.PTLB17.uv.dps</name>
                       <topology>B0.1.PTLB17.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7326,6 +8737,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7344,7 +8765,10 @@
                       <name>B0.1.LBP17.uv.dps</name>
                       <topology>B0.1.LBP17.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7359,6 +8783,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7385,7 +8819,10 @@
                       <name>B0.1.PTLB18.uv.dps</name>
                       <topology>B0.1.PTLB18.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7400,6 +8837,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7418,7 +8865,10 @@
                       <name>B0.1.LBP18.uv.dps</name>
                       <topology>B0.1.LBP18.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7433,6 +8883,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7459,7 +8919,10 @@
                       <name>B0.1.PTLB19.uv.dps</name>
                       <topology>B0.1.PTLB19.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7474,6 +8937,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7492,7 +8965,10 @@
                       <name>B0.1.LBP19.uv.dps</name>
                       <topology>B0.1.LBP19.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7507,6 +8983,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7533,7 +9019,10 @@
                       <name>B0.1.PTLB20.uv.dps</name>
                       <topology>B0.1.PTLB20.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7548,6 +9037,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7566,7 +9065,10 @@
                       <name>B0.1.LBP20.uv.dps</name>
                       <topology>B0.1.LBP20.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7581,6 +9083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7607,7 +9119,10 @@
                       <name>B0.1.PTLB21.uv.dps</name>
                       <topology>B0.1.PTLB21.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7622,6 +9137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7640,7 +9165,10 @@
                       <name>B0.1.LBP21.uv.dps</name>
                       <topology>B0.1.LBP21.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7655,6 +9183,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7681,7 +9219,10 @@
                       <name>B0.1.PTLB22.uv.dps</name>
                       <topology>B0.1.PTLB22.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7696,6 +9237,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7714,7 +9265,10 @@
                       <name>B0.1.LBP22.uv.dps</name>
                       <topology>B0.1.LBP22.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7729,6 +9283,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7755,7 +9319,10 @@
                       <name>B0.1.PTLB23.uv.dps</name>
                       <topology>B0.1.PTLB23.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7770,6 +9337,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7788,7 +9365,10 @@
                       <name>B0.1.LBP23.uv.dps</name>
                       <topology>B0.1.LBP23.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7803,6 +9383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7829,7 +9419,10 @@
                       <name>B0.1.PTLB24.uv.dps</name>
                       <topology>B0.1.PTLB24.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7844,6 +9437,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7862,7 +9465,10 @@
                       <name>B0.1.LBP24.uv.dps</name>
                       <topology>B0.1.LBP24.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7877,6 +9483,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7903,7 +9519,10 @@
                       <name>B0.1.PTLB25.uv.dps</name>
                       <topology>B0.1.PTLB25.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7918,6 +9537,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -7936,7 +9565,10 @@
                       <name>B0.1.LBP25.uv.dps</name>
                       <topology>B0.1.LBP25.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7951,6 +9583,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -7977,7 +9619,10 @@
                       <name>B0.1.PTLB26.uv.dps</name>
                       <topology>B0.1.PTLB26.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -7992,6 +9637,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8010,7 +9665,10 @@
                       <name>B0.1.LBP26.uv.dps</name>
                       <topology>B0.1.LBP26.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8025,6 +9683,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8051,7 +9719,10 @@
                       <name>B0.1.PTLB27.uv.dps</name>
                       <topology>B0.1.PTLB27.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8066,6 +9737,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8084,7 +9765,10 @@
                       <name>B0.1.LBP27.uv.dps</name>
                       <topology>B0.1.LBP27.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8099,6 +9783,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8125,7 +9819,10 @@
                       <name>B0.1.PTLB28.uv.dps</name>
                       <topology>B0.1.PTLB28.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8140,6 +9837,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8158,7 +9865,10 @@
                       <name>B0.1.LBP28.uv.dps</name>
                       <topology>B0.1.LBP28.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8173,6 +9883,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8199,7 +9919,10 @@
                       <name>B0.1.PTLB29.uv.dps</name>
                       <topology>B0.1.PTLB29.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8214,6 +9937,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8232,7 +9965,10 @@
                       <name>B0.1.LBP29.uv.dps</name>
                       <topology>B0.1.LBP29.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8247,6 +9983,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8273,7 +10019,10 @@
                       <name>B0.1.PTLB30.uv.dps</name>
                       <topology>B0.1.PTLB30.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8288,6 +10037,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8306,7 +10065,10 @@
                       <name>B0.1.LBP30.uv.dps</name>
                       <topology>B0.1.LBP30.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8321,6 +10083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8347,7 +10119,10 @@
                       <name>B0.1.PTLB31.uv.dps</name>
                       <topology>B0.1.PTLB31.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8362,6 +10137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8380,7 +10165,10 @@
                       <name>B0.1.LBP31.uv.dps</name>
                       <topology>B0.1.LBP31.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8395,6 +10183,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8421,7 +10219,10 @@
                       <name>B0.1.PTLB32.uv.dps</name>
                       <topology>B0.1.PTLB32.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8436,6 +10237,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8454,7 +10265,10 @@
                       <name>B0.1.LBP32.uv.dps</name>
                       <topology>B0.1.LBP32.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8469,6 +10283,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8495,7 +10319,10 @@
                       <name>B0.1.PTLB33.uv.dps</name>
                       <topology>B0.1.PTLB33.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8510,6 +10337,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8528,7 +10365,10 @@
                       <name>B0.1.LBP33.uv.dps</name>
                       <topology>B0.1.LBP33.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8543,6 +10383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8569,7 +10419,10 @@
                       <name>B0.1.PTLB34.uv.dps</name>
                       <topology>B0.1.PTLB34.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8584,6 +10437,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8602,7 +10465,10 @@
                       <name>B0.1.LBP34.uv.dps</name>
                       <topology>B0.1.LBP34.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8617,6 +10483,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8643,7 +10519,10 @@
                       <name>B0.1.PTLB35.uv.dps</name>
                       <topology>B0.1.PTLB35.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8658,6 +10537,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8676,7 +10565,10 @@
                       <name>B0.1.LBP35.uv.dps</name>
                       <topology>B0.1.LBP35.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8691,6 +10583,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8717,7 +10619,10 @@
                       <name>B0.1.PTLB36.uv.dps</name>
                       <topology>B0.1.PTLB36.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8732,6 +10637,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8750,7 +10665,10 @@
                       <name>B0.1.LBP36.uv.dps</name>
                       <topology>B0.1.LBP36.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8765,6 +10683,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8791,7 +10719,10 @@
                       <name>B0.1.PTLB37.uv.dps</name>
                       <topology>B0.1.PTLB37.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8806,6 +10737,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8824,7 +10765,10 @@
                       <name>B0.1.LBP37.uv.dps</name>
                       <topology>B0.1.LBP37.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8839,6 +10783,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8865,7 +10819,10 @@
                       <name>B0.1.PTLB38.uv.dps</name>
                       <topology>B0.1.PTLB38.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8880,6 +10837,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8898,7 +10865,10 @@
                       <name>B0.1.LBP38.uv.dps</name>
                       <topology>B0.1.LBP38.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8913,6 +10883,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -8939,7 +10919,10 @@
                       <name>B0.1.PTLB39.uv.dps</name>
                       <topology>B0.1.PTLB39.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8954,6 +10937,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -8972,7 +10965,10 @@
                       <name>B0.1.LBP39.uv.dps</name>
                       <topology>B0.1.LBP39.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -8987,6 +10983,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9013,7 +11019,10 @@
                       <name>B0.1.PTLB40.uv.dps</name>
                       <topology>B0.1.PTLB40.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9028,6 +11037,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9046,7 +11065,10 @@
                       <name>B0.1.LBP40.uv.dps</name>
                       <topology>B0.1.LBP40.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9061,6 +11083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9087,7 +11119,10 @@
                       <name>B0.1.PTLB41.uv.dps</name>
                       <topology>B0.1.PTLB41.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9102,6 +11137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9120,7 +11165,10 @@
                       <name>B0.1.LBP41.uv.dps</name>
                       <topology>B0.1.LBP41.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9135,6 +11183,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9161,7 +11219,10 @@
                       <name>B0.1.PTLB42.uv.dps</name>
                       <topology>B0.1.PTLB42.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9176,6 +11237,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9194,7 +11265,10 @@
                       <name>B0.1.LBP42.uv.dps</name>
                       <topology>B0.1.LBP42.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9209,6 +11283,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9235,7 +11319,10 @@
                       <name>B0.1.PTLB43.uv.dps</name>
                       <topology>B0.1.PTLB43.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9250,6 +11337,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9268,7 +11365,10 @@
                       <name>B0.1.LBP43.uv.dps</name>
                       <topology>B0.1.LBP43.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9283,6 +11383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9309,7 +11419,10 @@
                       <name>B0.1.PTLB44.uv.dps</name>
                       <topology>B0.1.PTLB44.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9324,6 +11437,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9342,7 +11465,10 @@
                       <name>B0.1.LBP44.uv.dps</name>
                       <topology>B0.1.LBP44.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9357,6 +11483,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9383,7 +11519,10 @@
                       <name>B0.1.PTLB45.uv.dps</name>
                       <topology>B0.1.PTLB45.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9398,6 +11537,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9416,7 +11565,10 @@
                       <name>B0.1.LBP45.uv.dps</name>
                       <topology>B0.1.LBP45.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9431,6 +11583,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9457,7 +11619,10 @@
                       <name>B0.1.PTLB46.uv.dps</name>
                       <topology>B0.1.PTLB46.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9472,6 +11637,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9490,7 +11665,10 @@
                       <name>B0.1.LBP46.uv.dps</name>
                       <topology>B0.1.LBP46.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9505,6 +11683,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9531,7 +11719,10 @@
                       <name>B0.1.PTLB47.uv.dps</name>
                       <topology>B0.1.PTLB47.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9546,6 +11737,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9564,7 +11765,10 @@
                       <name>B0.1.LBP47.uv.dps</name>
                       <topology>B0.1.LBP47.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9579,6 +11783,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9605,7 +11819,10 @@
                       <name>B0.1.PTLB48.uv.dps</name>
                       <topology>B0.1.PTLB48.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9620,6 +11837,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9638,7 +11865,10 @@
                       <name>B0.1.LBP48.uv.dps</name>
                       <topology>B0.1.LBP48.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9653,6 +11883,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9679,7 +11919,10 @@
                       <name>B0.1.PTLB49.uv.dps</name>
                       <topology>B0.1.PTLB49.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9694,6 +11937,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9712,7 +11965,10 @@
                       <name>B0.1.LBP49.uv.dps</name>
                       <topology>B0.1.LBP49.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9727,6 +11983,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9753,7 +12019,10 @@
                       <name>B0.1.PTLB50.uv.dps</name>
                       <topology>B0.1.PTLB50.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9768,6 +12037,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9786,7 +12065,10 @@
                       <name>B0.1.LBP50.uv.dps</name>
                       <topology>B0.1.LBP50.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9801,6 +12083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9827,7 +12119,10 @@
                       <name>B0.1.PTLB51.uv.dps</name>
                       <topology>B0.1.PTLB51.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9842,6 +12137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9860,7 +12165,10 @@
                       <name>B0.1.LBP51.uv.dps</name>
                       <topology>B0.1.LBP51.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9875,6 +12183,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9901,7 +12219,10 @@
                       <name>B0.1.PTLB52.uv.dps</name>
                       <topology>B0.1.PTLB52.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9916,6 +12237,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -9934,7 +12265,10 @@
                       <name>B0.1.LBP52.uv.dps</name>
                       <topology>B0.1.LBP52.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9949,6 +12283,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -9975,7 +12319,10 @@
                       <name>B0.1.PTLB53.uv.dps</name>
                       <topology>B0.1.PTLB53.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -9990,6 +12337,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10008,7 +12365,10 @@
                       <name>B0.1.LBP53.uv.dps</name>
                       <topology>B0.1.LBP53.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10023,6 +12383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10049,7 +12419,10 @@
                       <name>B0.1.PTLB54.uv.dps</name>
                       <topology>B0.1.PTLB54.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10064,6 +12437,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10082,7 +12465,10 @@
                       <name>B0.1.LBP54.uv.dps</name>
                       <topology>B0.1.LBP54.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10097,6 +12483,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10123,7 +12519,10 @@
                       <name>B0.1.PTLB55.uv.dps</name>
                       <topology>B0.1.PTLB55.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10138,6 +12537,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10156,7 +12565,10 @@
                       <name>B0.1.LBP55.uv.dps</name>
                       <topology>B0.1.LBP55.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10171,6 +12583,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10197,7 +12619,10 @@
                       <name>B0.1.PTLB56.uv.dps</name>
                       <topology>B0.1.PTLB56.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10212,6 +12637,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10230,7 +12665,10 @@
                       <name>B0.1.LBP56.uv.dps</name>
                       <topology>B0.1.LBP56.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10245,6 +12683,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10271,7 +12719,10 @@
                       <name>B0.1.PTLB57.uv.dps</name>
                       <topology>B0.1.PTLB57.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10286,6 +12737,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10304,7 +12765,10 @@
                       <name>B0.1.LBP57.uv.dps</name>
                       <topology>B0.1.LBP57.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10319,6 +12783,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10345,7 +12819,10 @@
                       <name>B0.1.PTLB58.uv.dps</name>
                       <topology>B0.1.PTLB58.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10360,6 +12837,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10378,7 +12865,10 @@
                       <name>B0.1.LBP58.uv.dps</name>
                       <topology>B0.1.LBP58.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10393,6 +12883,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10419,7 +12919,10 @@
                       <name>B0.1.PTLB59.uv.dps</name>
                       <topology>B0.1.PTLB59.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10434,6 +12937,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10452,7 +12965,10 @@
                       <name>B0.1.LBP59.uv.dps</name>
                       <topology>B0.1.LBP59.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10467,6 +12983,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -10493,7 +13019,10 @@
                       <name>B0.1.PTLB60.uv.dps</name>
                       <topology>B0.1.PTLB60.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -10508,6 +13037,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>1500</duration>
@@ -10526,7 +13065,10 @@
                       <name>B0.1.LBP60.uv.dps</name>
                       <topology>B0.1.LBP60.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml b/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
index fe97241353c264a0d0db19c131cd41db64ae148e..6035b42c157e023de38a331d11ec333084840526 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LOFAROBS</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -147,7 +150,10 @@
                     <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>   
@@ -188,7 +194,10 @@
                     <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>   
@@ -229,7 +238,10 @@
                     <name>B0.1.T.SAP003.uv.dps</name>
                     <topology>B0.1.T.SAP003.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -270,7 +282,10 @@
                     <name>B0.1.T.SAP004.uv.dps</name>
                     <topology>B0.1.T.SAP004.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -311,7 +326,10 @@
                     <name>B0.1.T.SAP005.uv.dps</name>
                     <topology>B0.1.T.SAP005.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -352,7 +370,10 @@
                     <name>B0.1.T.SAP006.uv.dps</name>
                     <topology>B0.1.T.SAP006.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -393,7 +414,10 @@
                     <name>B0.1.T.SAP007.uv.dps</name>
                     <topology>B0.1.T.SAP007.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -411,6 +435,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -437,7 +471,10 @@
                       <name>B0.1.PT0.0.uv.dps</name>
                       <topology>B0.1.PT0.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -452,6 +489,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -478,7 +525,10 @@
                       <name>B0.1.PT0.1.uv.dps</name>
                       <topology>B0.1.PT0.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -493,6 +543,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -519,7 +579,10 @@
                       <name>B0.1.PT1.0.uv.dps</name>
                       <topology>B0.1.PT1.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -534,6 +597,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -560,7 +633,10 @@
                       <name>B0.1.PT1.1.uv.dps</name>
                       <topology>B0.1.PT1.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -575,6 +651,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -601,7 +687,10 @@
                       <name>B0.1.PT2.0.uv.dps</name>
                       <topology>B0.1.PT2.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -616,6 +705,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -642,7 +741,10 @@
                       <name>B0.1.PT2.1.uv.dps</name>
                       <topology>B0.1.PT2.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -657,6 +759,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -683,7 +795,10 @@
                       <name>B0.1.PT3.0.uv.dps</name>
                       <topology>B0.1.PT3.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -698,6 +813,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -724,7 +849,10 @@
                       <name>B0.1.PT3.1.uv.dps</name>
                       <topology>B0.1.PT3.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -739,6 +867,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -765,7 +903,10 @@
                       <name>B0.1.PT4.0.uv.dps</name>
                       <topology>B0.1.PT4.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -780,6 +921,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -806,7 +957,10 @@
                       <name>B0.1.PT4.1.uv.dps</name>
                       <topology>B0.1.PT4.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -821,6 +975,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -847,7 +1011,10 @@
                       <name>B0.1.PT5.0.uv.dps</name>
                       <topology>B0.1.PT5.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -862,6 +1029,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -888,7 +1065,10 @@
                       <name>B0.1.PT5.1.uv.dps</name>
                       <topology>B0.1.PT5.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -903,6 +1083,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -929,7 +1119,10 @@
                       <name>B0.1.PT6.0.uv.dps</name>
                       <topology>B0.1.PT6.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -944,6 +1137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -970,7 +1173,10 @@
                       <name>B0.1.PT6.1.uv.dps</name>
                       <topology>B0.1.PT6.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -985,6 +1191,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -1011,7 +1227,10 @@
                       <name>B0.1.PT7.0.uv.dps</name>
                       <topology>B0.1.PT7.0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -1026,6 +1245,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing Pipeline</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -1052,7 +1281,10 @@
                       <name>B0.1.PT7.1.uv.dps</name>
                       <topology>B0.1.PT7.1.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/Ticket_6923.xml b/SAS/XML_generator/test/test_regression.in_data/xml/Ticket_6923.xml
index ea6608406827139447e60f8c6ec1bb62776e065e..8c39674edee3f173b1e06004aa0580ac0bf99a2f 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/Ticket_6923.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/Ticket_6923.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC2_040</name>
   <children>
@@ -110,7 +110,10 @@
                     <name>B0.1.T.SAP000.cs</name>
                     <topology>B0.1.T.SAP000.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -160,7 +163,10 @@
                     <name>B0.1.T.SAP001.cs</name>
                     <topology>B0.1.T.SAP001.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -210,7 +216,10 @@
                     <name>B0.1.T.SAP002.cs</name>
                     <topology>B0.1.T.SAP002.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -255,7 +264,10 @@
                     <name>B0.1.T.SAP003.cs</name>
                     <topology>B0.1.T.SAP003.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -366,7 +378,10 @@
                     <name>B1.1.T.SAP000.cs</name>
                     <topology>B1.1.T.SAP000.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -416,7 +431,10 @@
                     <name>B1.1.T.SAP001.cs</name>
                     <topology>B1.1.T.SAP001.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -466,7 +484,10 @@
                     <name>B1.1.T.SAP002.cs</name>
                     <topology>B1.1.T.SAP002.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -511,7 +532,10 @@
                     <name>B1.1.T.SAP003.cs</name>
                     <topology>B1.1.T.SAP003.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -622,7 +646,10 @@
                     <name>B2.1.T.SAP000.cs</name>
                     <topology>B2.1.T.SAP000.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -672,7 +699,10 @@
                     <name>B2.1.T.SAP001.cs</name>
                     <topology>B2.1.T.SAP001.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -722,7 +752,10 @@
                     <name>B2.1.T.SAP002.cs</name>
                     <topology>B2.1.T.SAP002.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -767,7 +800,10 @@
                     <name>B2.1.T.SAP003.cs</name>
                     <topology>B2.1.T.SAP003.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -878,7 +914,10 @@
                     <name>B3.1.T.SAP000.cs</name>
                     <topology>B3.1.T.SAP000.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -928,7 +967,10 @@
                     <name>B3.1.T.SAP001.cs</name>
                     <topology>B3.1.T.SAP001.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -978,7 +1020,10 @@
                     <name>B3.1.T.SAP002.cs</name>
                     <topology>B3.1.T.SAP002.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1023,7 +1068,10 @@
                     <name>B3.1.T.SAP003.cs</name>
                     <topology>B3.1.T.SAP003.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1134,7 +1182,10 @@
                     <name>B4.1.T.SAP000.cs</name>
                     <topology>B4.1.T.SAP000.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1184,7 +1235,10 @@
                     <name>B4.1.T.SAP001.cs</name>
                     <topology>B4.1.T.SAP001.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1234,7 +1288,10 @@
                     <name>B4.1.T.SAP002.cs</name>
                     <topology>B4.1.T.SAP002.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -1279,7 +1336,10 @@
                     <name>B4.1.T.SAP003.cs</name>
                     <topology>B4.1.T.SAP003.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/hd156279b_reference.xml b/SAS/XML_generator/test/test_regression.in_data/xml/hd156279b_reference.xml
index f9879add21eb1ed6c77b8d69b75cb310ffedb3a5..0b823dbcb3a76e00e6ab95b35dfd5f0676dc53ac 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/hd156279b_reference.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/hd156279b_reference.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_012</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -147,7 +150,10 @@
                     <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>   
@@ -165,6 +171,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (no export)</defaultTemplate>
                   <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -201,7 +217,10 @@
                       <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>
@@ -209,7 +228,10 @@
                       <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>
@@ -224,6 +246,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>LBAdefault</flaggingStrategy>
@@ -265,7 +297,10 @@
                             <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> 
                     </resultDataProducts>               
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/lc4_019_1.xml b/SAS/XML_generator/test/test_regression.in_data/xml/lc4_019_1.xml
index a203ef554be66c0505393b2c1291a70c9f3e4a86..f5cc0fdb69e77722cd899e21e91849db032cb6bb 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/lc4_019_1.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/lc4_019_1.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>LC4_019</name>
   <children>
@@ -110,7 +110,10 @@
                     <name>B0.1.T.SAP000.cs</name>
                     <topology>B0.1.T.SAP000.cs</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -128,6 +131,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Pulsar Pipeline</defaultTemplate>
                   <duration>28800</duration>
@@ -166,7 +179,10 @@
                       <name>B0.1.PT0.pu.dps</name>
                       <topology>B0.1.PT0.pu.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:pulsarDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/test_LB.xml b/SAS/XML_generator/test/test_regression.in_data/xml/test_LB.xml
index 9453dda04abd281b19c8f72e8cb4c65680012571..b72b8d4d93235e271a6aa471b42aca83cbb92ddc 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/test_LB.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/test_LB.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>test-lofar</name>
   <children>
@@ -106,7 +106,10 @@
                     <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>   
@@ -124,6 +127,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -160,7 +173,10 @@
                       <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>
@@ -168,7 +184,10 @@
                       <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>
@@ -263,7 +282,10 @@
                     <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>   
@@ -281,6 +303,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -322,7 +354,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -337,6 +372,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -363,7 +408,10 @@
                       <name>B0.1.PTLB0.uv.dps</name>
                       <topology>B0.1.PTLB0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -378,6 +426,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>0</duration>
@@ -396,7 +454,10 @@
                       <name>B0.1.LBP0.uv.dps</name>
                       <topology>B0.1.LBP0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -491,7 +552,10 @@
                     <name>B0.2.C.SAP000.uv.dps</name>
                     <topology>B0.2.C.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -509,6 +573,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -545,7 +619,10 @@
                       <name>B0.2.CPC.inst.dps</name>
                       <topology>B0.2.CPC.inst.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:instrumentModelDataProduct>
                   </item>
                   <item>
@@ -553,7 +630,10 @@
                       <name>B0.2.CPC.uv.dps</name>
                       <topology>B0.2.CPC.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -648,7 +728,10 @@
                     <name>B0.2.T.SAP000.uv.dps</name>
                     <topology>B0.2.T.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -666,6 +749,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -707,7 +800,10 @@
                             <name>B0.2.PT0.uv.dps</name>
                             <topology>B0.2.PT0.uv.dps</topology>
                             <status>no_data</status>
-                            
+                            <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                           </lofar:uvDataProduct>
                         </item> 
                     </resultDataProducts>               
@@ -722,6 +818,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -748,7 +854,10 @@
                       <name>B0.2.PTLB0.uv.dps</name>
                       <topology>B0.2.PTLB0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -763,6 +872,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>0</duration>
@@ -781,7 +900,10 @@
                       <name>B0.2.LBP0.uv.dps</name>
                       <topology>B0.2.LBP0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/test_input.xml b/SAS/XML_generator/test/test_regression.in_data/xml/test_input.xml
index 1eb1b910036a9f2a9d3086ab267de51d1a76f581..7ef0ed075ff688f29caa7ea29e725cf90a2cf7df 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/test_input.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/test_input.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>test_lofar</name>
   <children>
@@ -101,7 +101,10 @@
                     <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>
                                   <item>
@@ -109,7 +112,10 @@
                     <name>B0.1.T.SAP000.is</name>
                     <topology>B0.1.T.SAP000.is</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -127,6 +133,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Pulsar Pipeline</defaultTemplate>
                   <duration>600</duration>
@@ -165,7 +181,10 @@
                       <name>B0.1.PT0.pu.dps</name>
                       <topology>B0.1.PT0.pu.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:pulsarDataProduct>
                   </item>
                 </resultDataProducts>
@@ -260,7 +279,10 @@
                     <name>B0.2.T.SAP000.uv.dps</name>
                     <topology>B0.2.T.SAP000.uv.dps</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                                   <item>
@@ -268,7 +290,10 @@
                     <name>B0.2.T.SAP000.is</name>
                     <topology>B0.2.T.SAP000.is</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -286,6 +311,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Pulsar Pipeline</defaultTemplate>
                   <duration>600</duration>
@@ -324,7 +359,10 @@
                       <name>B0.2.PT0.pu.dps</name>
                       <topology>B0.2.PT0.pu.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:pulsarDataProduct>
                   </item>
                 </resultDataProducts>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/test_input_long_baseline_pipeline.xml b/SAS/XML_generator/test/test_regression.in_data/xml/test_input_long_baseline_pipeline.xml
index ef45b281b95aecb53628959760f8df5e76f3ac05..1a3a088592ac9ecbe41ccbac5d71295cb6a48d71 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/test_input_long_baseline_pipeline.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/test_input_long_baseline_pipeline.xml
@@ -1,8 +1,8 @@
 <?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>2.16.3</version>
-  <template version="2.16.3" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
-  <description>XML Template generator version 2.16.3</description>
+  <version>2.17.0</version>
+  <template version="2.17.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+  <description>XML Template generator version 2.17.0</description>
   </template>
   <name>test-lofar</name>
   <children>
@@ -105,7 +105,10 @@
                     <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>
                                   <item>
@@ -113,7 +116,10 @@
                     <name>B0.1.C.SAP000.is</name>
                     <topology>B0.1.C.SAP000.is</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -131,6 +137,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -167,7 +183,10 @@
                       <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>
@@ -175,7 +194,10 @@
                       <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>
@@ -270,7 +292,10 @@
                     <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>
                                   <item>
@@ -278,7 +303,10 @@
                     <name>B0.1.T.SAP000.is</name>
                     <topology>B0.1.T.SAP000.is</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -323,7 +351,10 @@
                     <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>
                                   <item>
@@ -331,7 +362,10 @@
                     <name>B0.1.T.SAP001.is</name>
                     <topology>B0.1.T.SAP001.is</topology>
                     <status>no_data</status>
-                    
+                    <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:bfDataProduct>
                   </item>
                         </resultDataProducts>   
@@ -349,6 +383,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Calibrator Pipeline (no export)</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -385,7 +429,10 @@
                       <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>
@@ -393,7 +440,10 @@
                       <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>
@@ -408,6 +458,16 @@
                     <currentStatus>
                       <mom2:openedStatus/>
                     </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                     <pipelineAttributes>
                       <defaultTemplate>Calibration Pipeline Target</defaultTemplate>
                       <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -449,7 +509,10 @@
                             <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> 
                     </resultDataProducts>               
@@ -464,6 +527,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Preprocessing LB</defaultTemplate>
                   <flaggingStrategy>HBAdefault</flaggingStrategy>
@@ -490,7 +563,10 @@
                       <name>B0.1.PTLB0.uv.dps</name>
                       <topology>B0.1.PTLB0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>
@@ -505,6 +581,16 @@
                 <currentStatus>
                   <mom2:openedStatus/>
                 </currentStatus>
+  <processingCluster>
+                    <name>CEP4</name>
+                    <partition>cpu</partition>
+                    <numberOfTasks>24</numberOfTasks>
+                    <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
+                    <minScratchPerTask unit="byte">100000000</minScratchPerTask>    
+                    <maxDurationPerTask>PT600S</maxDurationPerTask>
+                    <numberOfCoresPerTask>20</numberOfCoresPerTask>
+                    <runSimultaneous>true</runSimultaneous>
+                  </processingCluster>
                 <pipelineAttributes>
                   <defaultTemplate>Long-Baseline Pipeline</defaultTemplate>
                   <duration>600</duration>
@@ -523,7 +609,10 @@
                       <name>B0.1.LBP0.uv.dps</name>
                       <topology>B0.1.LBP0.uv.dps</topology>
                       <status>no_data</status>
-                      
+                      <storageCluster>
+                      <name>CEP4</name>
+                      <partition>/data/projects/</partition>
+                    </storageCluster>
                     </lofar:uvDataProduct>
                   </item>
                 </resultDataProducts>