diff --git a/SAS/TMSS/frontend/tmss_webapp/src/__mocks__/observing_strategy_templates.json b/SAS/TMSS/frontend/tmss_webapp/src/__mocks__/observing_strategy_templates.json
index 842e574f4a1cb72c356fd1d979804c61d530a50b..9cde4f3821b30c634b65bad9f39ce0e113e0b04b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/__mocks__/observing_strategy_templates.json
+++ b/SAS/TMSS/frontend/tmss_webapp/src/__mocks__/observing_strategy_templates.json
@@ -1656,11 +1656,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 7
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -2855,7 +2855,7 @@
             },
             "version": 19,
             "id": 3,
-            "state_value": "active",
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
@@ -5147,11 +5147,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -5201,9 +5201,11 @@
                     "scheduler": "fixed_time",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0.008726646259971648,
-                            "sun": 0.008726646259971648
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.008726646259971648,
+                                "sun": 0.008726646259971648
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0,
@@ -5231,7 +5233,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 6
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -5989,7 +5991,7 @@
                                     {
                                         "digital_pointing": {
                                             "angle1": 5.06907719268138,
-                                            "angle2": 1.3819471262859173,
+                                            "angle2": 0.38194712628591737,
                                             "direction_type": "J2000",
                                             "target": "B1919+21"
                                         },
@@ -6520,7 +6522,7 @@
                                 ],
                                 "tile_beam": {
                                     "angle1": 5.06907719268138,
-                                    "angle2": 1.3819471262859173,
+                                    "angle2": 0.38194712628591737,
                                     "direction_type": "J2000",
                                     "target": "B1919+21"
                                 }
@@ -6614,11 +6616,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -6680,9 +6682,11 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0.00872665,
-                            "sun": 0.00872665
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0.5235987755982988,
@@ -6696,7 +6700,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -9936,11 +9940,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 2
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/2/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -9970,9 +9974,11 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.00872665,
-                            "moon": 0.00872665,
-                            "sun": 0.00872665
+                            "target": {
+                                "jupiter": 0.00872665,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0,
@@ -9999,7 +10005,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -11992,11 +11998,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 7
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -13203,7 +13209,7 @@
             },
             "version": 23,
             "id": 12,
-            "state_value": "active",
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
@@ -13212,11 +13218,11 @@
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
-            "state": "development",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -13272,9 +13278,11 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0.00872665,
-                            "sun": 0.00872665
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
+                            }
                         },
                         "transit_offset": {
                             "from": -21600,
@@ -13284,7 +13292,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -13886,7 +13894,6 @@
                                                     "CS028",
                                                     "CS030",
                                                     "CS031",
-                                                    "CS032",
                                                     "CS101",
                                                     "CS103",
                                                     "CS201",
@@ -14337,7 +14344,6 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
-                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -14423,7 +14429,7 @@
             },
             "version": 24,
             "id": 13,
-            "state_value": "development",
+            "state_value": "active",
             "purpose_value": "technical_commissioning"
         },
         {
@@ -17545,21 +17551,28 @@
             "purpose_value": "technical_commissioning"
         },
         {
-            "description": "Fly's Eye Monitoring. Fly's Eye observation of a known pulsar for station quality monitoring",
-            "name": "FE monitoring",
+            "description": "Fly's Eye (FE) strategy with flexible settings (generic)",
+            "name": "FE generic",
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 7
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
                         ]
                     },
                     {
@@ -17585,37 +17598,68 @@
                         "refs": [
                             "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
                         ]
+                    },
+                    {
+                        "name": "Observing mode settings",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/flys eye/settings"
+                        ]
+                    },
+                    {
+                        "name": "Observation Short Description",
+                        "refs": [
+                            "#/tasks/Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Short Description",
+                        "refs": [
+                            "#/tasks/Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run DSPSR?",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/dspsr/enabled"
+                        ]
+                    },
+                    {
+                        "name": "Run Prepfold?",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/presto/fold_profile"
+                        ]
+                    },
+                    {
+                        "name": "Docker container",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/software_version"
+                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
+                    "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.00872665,
+                            "jupiter": 0,
                             "moon": 0.00872665,
                             "sun": 0.00872665
                         },
-                        "min_elevation": {
-                            "calibrator": 0.523599,
-                            "target": 0.523599
-                        },
                         "transit_offset": {
-                            "from": -50400,
-                            "to": 50400
+                            "from": -21600,
+                            "to": 21600
                         }
-                    },
-                    "time": {
-                        "between": [],
-                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 4
+                    "version": 8
                 },
                 "task_relations": [
                     {
@@ -17634,11 +17678,30 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "pulp analysis",
                             "datatype": "pulsar profile",
@@ -17653,7 +17716,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -17661,7 +17724,7 @@
                         "input": {
                             "dataformat": "Beamformed",
                             "datatype": "time series",
-                            "role": "any"
+                            "role": "beamformer"
                         },
                         "output": {
                             "dataformat": "Beamformed",
@@ -17672,45 +17735,79 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
                     }
                 ],
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "Cleanup",
+                        "description": "Cleanup all dataproducts from disk",
+                        "short_description": "Make CEP4 clean again",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
-                            "version": 4
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest the pipeline outputs dataproducts",
+                        "short_description": "Archive to the LTA",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
                         }
                     },
                     "Observation": {
-                        "description": "Fly's Eye Observation with all stations",
-                        "short_description": "IPS FE1",
+                        "description": "FE observation with all available Core, Remote, and International stations",
+                        "short_description": "B0329+54",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": true,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": false,
-                                    "enabled": true
-                                }
-                            },
                             "beamformer": {
                                 "pipelines": [
                                     {
                                         "coherent": {
                                             "SAPs": [],
                                             "settings": {
-                                                "channels_per_subband": 1,
+                                                "channels_per_subband": 16,
                                                 "quantisation": {
                                                     "bits": 8,
                                                     "enabled": false,
@@ -17719,7 +17816,7 @@
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 6
                                             }
                                         },
                                         "flys eye": {
@@ -17734,30 +17831,14 @@
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 6
                                             }
                                         },
-                                        "name": "FE",
+                                        "name": "Beamformer CV",
                                         "station_groups": [
                                             {
-                                                "max_nr_missing": 20,
+                                                "max_nr_missing": 21,
                                                 "stations": [
-                                                    "CS001",
                                                     "CS002",
                                                     "CS003",
                                                     "CS004",
@@ -17767,20 +17848,23 @@
                                                     "CS011",
                                                     "CS013",
                                                     "CS017",
-                                                    "CS021",
                                                     "CS024",
                                                     "CS026",
                                                     "CS028",
                                                     "CS030",
                                                     "CS031",
-                                                    "CS032",
                                                     "CS101",
                                                     "CS103",
                                                     "CS201",
                                                     "CS301",
                                                     "CS302",
                                                     "CS401",
-                                                    "CS501",
+                                                    "CS501"
+                                                ]
+                                            },
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
                                                     "RS106",
                                                     "RS205",
                                                     "RS208",
@@ -17794,18 +17878,26 @@
                                                     "RS409",
                                                     "RS503",
                                                     "RS508",
-                                                    "RS509",
+                                                    "RS509"
+                                                ]
+                                            },
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
                                                     "DE601",
                                                     "DE602",
                                                     "DE603",
                                                     "DE604",
                                                     "DE605",
+                                                    "DE609",
                                                     "FR606",
                                                     "SE607",
-                                                    "DE609",
+                                                    "UK608",
                                                     "PL610",
                                                     "PL611",
-                                                    "PL612"
+                                                    "PL612",
+                                                    "IE613",
+                                                    "LV614"
                                                 ]
                                             }
                                         ]
@@ -17818,13 +17910,16 @@
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 2.1598085883168996,
-                                            "angle2": 1.300007038906933,
+                                            "angle1": 0.929340281009274,
+                                            "angle2": 0.952586389190502,
                                             "direction_type": "J2000",
-                                            "target": "B0809+74"
+                                            "target": "B0329+54"
                                         },
-                                        "name": "FE_pointing",
+                                        "name": "SAP0",
                                         "subbands": [
+                                            51,
+                                            52,
+                                            53,
                                             54,
                                             55,
                                             56,
@@ -18221,10 +18316,7 @@
                                             447,
                                             448,
                                             449,
-                                            450,
-                                            451,
-                                            452,
-                                            453
+                                            450
                                         ]
                                     }
                                 ],
@@ -18232,9 +18324,8 @@
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 20,
+                                        "max_nr_missing": 21,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -18244,20 +18335,23 @@
                                             "CS011",
                                             "CS013",
                                             "CS017",
-                                            "CS021",
                                             "CS024",
                                             "CS026",
                                             "CS028",
                                             "CS030",
                                             "CS031",
-                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
                                             "CS301",
                                             "CS302",
                                             "CS401",
-                                            "CS501",
+                                            "CS501"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
                                             "RS106",
                                             "RS205",
                                             "RS208",
@@ -18271,7 +18365,12 @@
                                             "RS409",
                                             "RS503",
                                             "RS508",
-                                            "RS509",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
                                             "DE601",
                                             "DE602",
                                             "DE603",
@@ -18290,25 +18389,25 @@
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 2.1598085883168996,
-                                    "angle2": 1.300007038906933,
+                                    "angle1": 0.929340281009274,
+                                    "angle2": 0.952586389190502,
                                     "direction_type": "J2000",
-                                    "target": "B0809+74"
+                                    "target": "B0329+54"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "Pipeline": {
-                        "description": "Pulsar Pipeline for Fly's Eye observation",
-                        "short_description": "Baaaa+bb/PULP",
+                        "description": "Pulsar Pipeline to fold a pulsar for diagnostic purposes; HBA, FE, all stations, 8bit, Stokes I, subs: 51..450, 16 ch/sub, time averaging factor = 6 (491.52 mcs)",
+                        "short_description": "B0329+54/PULP",
                         "specifications_doc": {
                             "cluster_resources": {
                                 "cores_per_task": 2,
-                                "parallel_tasks": 38,
+                                "parallel_tasks": 20,
                                 "where": {
                                     "cluster": "CEP4",
                                     "partition": "cpu"
@@ -18321,14 +18420,15 @@
                                     "dm": 0,
                                     "integration_time_factor": 4
                                 },
-                                "enabled": true,
+                                "enabled": false,
+                                "number_of_bins": 1024,
                                 "optimise_period_dm": false,
                                 "rfi_excision": true,
                                 "subintegration_length": -1
                             },
                             "output": {
                                 "dynamic_spectrum": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "time_average": 0.5
                                 },
                                 "quantisation": {
@@ -18340,10 +18440,16 @@
                                 "fold_profile": true,
                                 "input": {
                                     "decode_sigma": 3,
-                                    "nr_blocks": 100,
-                                    "samples_per_block": 8192
+                                    "nr_blocks": 6,
+                                    "samples_per_block": 131072
+                                },
+                                "prepdata": {
+                                    "dm": -1
                                 },
                                 "prepfold": true,
+                                "rfifind": {
+                                    "blocks": 1
+                                },
                                 "rrats": {
                                     "dm_range": 5,
                                     "enabled": false
@@ -18353,36 +18459,38 @@
                                 "name": "",
                                 "strategy": "meta"
                             },
-                            "single_pulse_search": false
+                            "single_pulse_search": false,
+                            "software_version": "lofar-pulp:LOFAR-Release-taheatmap"
                         },
                         "specifications_template": {
                             "name": "pulsar pipeline",
-                            "version": 6
+                            "version": 9
                         }
                     }
                 }
             },
-            "version": 5,
+            "version": 6,
             "id": 17,
-            "state_value": "development",
+            "state_value": "legacy",
             "purpose_value": "technical_commissioning"
         },
         {
-            "description": "Test FE observation with one station",
-            "name": "FE RT test",
+            "description": "Fly's Eye (FE) strategy with flexible settings (generic)",
+            "name": "FE generic",
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 2
+                "version": 10
             },
-            "state": "legacy",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/station_groups"
                         ]
                     },
                     {
@@ -18392,60 +18500,182 @@
                         ]
                     },
                     {
-                        "name": "Duration FE1",
+                        "name": "Duration",
                         "refs": [
                             "#/tasks/Observation/specifications_doc/duration"
                         ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Observing mode settings",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/flys eye/settings"
+                        ]
+                    },
+                    {
+                        "name": "Observation Short Description",
+                        "refs": [
+                            "#/tasks/Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Short Description",
+                        "refs": [
+                            "#/tasks/Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run DSPSR?",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/dspsr/enabled"
+                        ]
+                    },
+                    {
+                        "name": "Length of sub-integrations",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/dspsr/subintegration_length"
+                        ]
+                    },
+                    {
+                        "name": "Run Prepfold?",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/presto/fold_profile"
+                        ]
+                    },
+                    {
+                        "name": "Number of bins",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/dspsr/number_of_bins"
+                        ]
+                    },
+                    {
+                        "name": "2bf2fits",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/presto/input"
+                        ]
+                    },
+                    {
+                        "name": "Rfifind (number of blocks)",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/presto/rfifind"
+                        ]
+                    },
+                    {
+                        "name": "Docker container",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/software_version"
+                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.00872665,
-                            "moon": 0.00872665,
-                            "sun": 0.00872665
-                        },
-                        "min_elevation": {
-                            "calibrator": 0,
-                            "target": 0
-                        },
-                        "reference_pointing": {
-                            "enabled": false,
-                            "pointing": {
-                                "angle1": 0,
-                                "angle2": 0,
-                                "direction_type": "J2000",
-                                "target": "_target_name_"
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
                             }
                         },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -21600,
+                            "to": 21600
                         }
-                    },
-                    "time": {
-                        "between": [],
-                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 6
+                    "version": 11
                 },
                 "task_relations": [
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Pipeline",
                         "input": {
                             "dataformat": "Beamformed",
                             "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
                             "role": "any"
                         },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
                         "output": {
                             "dataformat": "Beamformed",
                             "datatype": "time series",
@@ -18457,43 +18687,77 @@
                             "name": "all",
                             "version": 6
                         }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
                     }
                 ],
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "Cleanup",
+                        "description": "Cleanup all dataproducts from disk",
+                        "short_description": "Make CEP4 clean again",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
-                            "version": 6
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest the pipeline outputs dataproducts",
+                        "short_description": "Archive to the LTA",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
                         }
                     },
                     "Observation": {
-                        "description": "Fly's Eye observation with all available stations",
-                        "short_description": "IoS flys eye",
+                        "description": "FE observation with all available Core, Remote, and International stations",
+                        "short_description": "B0329+54",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "dynspec",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": false,
-                                    "enabled": false
-                                }
-                            },
                             "beamformer": {
                                 "pipelines": [
                                     {
                                         "coherent": {
                                             "SAPs": [],
                                             "settings": {
-                                                "channels_per_subband": 1,
+                                                "channels_per_subband": 16,
                                                 "quantisation": {
                                                     "bits": 8,
                                                     "enabled": false,
@@ -18502,7 +18766,7 @@
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 6
                                             }
                                         },
                                         "flys eye": {
@@ -18517,30 +18781,73 @@
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 6
                                             }
                                         },
-                                        "name": "FE",
+                                        "name": "Beamformer CV",
                                         "station_groups": [
                                             {
-                                                "max_nr_missing": 0,
+                                                "max_nr_missing": 21,
                                                 "stations": [
-                                                    "CS007"
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            },
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
+                                                    "RS106",
+                                                    "RS205",
+                                                    "RS208",
+                                                    "RS210",
+                                                    "RS305",
+                                                    "RS306",
+                                                    "RS307",
+                                                    "RS310",
+                                                    "RS406",
+                                                    "RS407",
+                                                    "RS409",
+                                                    "RS503",
+                                                    "RS508",
+                                                    "RS509"
+                                                ]
+                                            },
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
+                                                    "DE601",
+                                                    "DE602",
+                                                    "DE603",
+                                                    "DE604",
+                                                    "DE605",
+                                                    "DE609",
+                                                    "FR606",
+                                                    "SE607",
+                                                    "UK608",
+                                                    "PL610",
+                                                    "PL611",
+                                                    "PL612",
+                                                    "IE613",
+                                                    "LV614"
                                                 ]
                                             }
                                         ]
@@ -18553,13 +18860,90 @@
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
+                                            "angle1": 0.929340281009274,
+                                            "angle2": 0.952586389190502,
                                             "direction_type": "J2000",
-                                            "target": "CasA"
+                                            "target": "B0329+54"
                                         },
-                                        "name": "FE_pointing1",
+                                        "name": "SAP0",
                                         "subbands": [
+                                            51,
+                                            52,
+                                            53,
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
                                             128,
                                             129,
                                             130,
@@ -18759,69 +19143,329 @@
                                             324,
                                             325,
                                             326,
-                                            327
-                                        ]
-                                    }
-                                ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
-                                "station_groups": [
-                                    {
-                                        "max_nr_missing": 0,
-                                        "stations": [
-                                            "CS007"
-                                        ]
-                                    }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "_target_name_IPS_"
-                                }
-                            }
-                        },
-                        "specifications_template": {
-                            "name": "beamforming observation",
-                            "version": 8
-                        }
-                    }
-                }
-            },
-            "version": 3,
-            "id": 18,
-            "state_value": "legacy",
-            "purpose_value": "technical_commissioning"
-        },
-        {
-            "description": "Test FE observation with one station",
-            "name": "FE RT test",
-            "purpose": "technical_commissioning",
-            "scheduling_unit_template": {
-                "name": "scheduling unit",
-                "version": 2
-            },
-            "state": "legacy",
-            "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
-                "parameters": [
-                    {
-                        "name": "Stations",
-                        "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
-                        ]
-                    },
-                    {
-                        "name": "Scheduling Constraints",
-                        "refs": [
-                            "#/scheduling_constraints_doc"
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 21,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.929340281009274,
+                                    "angle2": 0.952586389190502,
+                                    "direction_type": "J2000",
+                                    "target": "B0329+54"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline": {
+                        "description": "Pulsar Pipeline to fold a pulsar for diagnostic purposes; HBA, FE, all stations, 8bit, Stokes I, subs: 51..450, 16 ch/sub, time averaging factor = 6 (491.52 mcs)",
+                        "short_description": "B0329+54/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "number_of_bins": 1024,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "single_pulse_subintegration": false,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": false,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 6,
+                                    "samples_per_block": 131072
+                                },
+                                "prepdata": {
+                                    "dm": -1
+                                },
+                                "prepfold": true,
+                                "rfifind": {
+                                    "blocks": 1
+                                },
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false,
+                            "software_version": "lofar-pulp:LOFAR-Release-taheatmap"
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 9
+                        }
+                    }
+                }
+            },
+            "version": 7,
+            "id": 18,
+            "state_value": "active",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "Fly's Eye Monitoring. Fly's Eye observation of a known pulsar for station quality monitoring",
+            "name": "FE monitoring",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 5
+            },
+            "state": "development",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
-                        "name": "Duration FE1",
+                        "name": "Duration",
                         "refs": [
                             "#/tasks/Observation/specifications_doc/duration"
                         ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
@@ -18830,7 +19474,6 @@
                         "require_day": false,
                         "require_night": false
                     },
-                    "scheduler": "fixed_time",
                     "sky": {
                         "min_distance": {
                             "jupiter": 0.00872665,
@@ -18838,34 +19481,62 @@
                             "sun": 0.00872665
                         },
                         "min_elevation": {
-                            "calibrator": 0,
-                            "target": 0
-                        },
-                        "reference_pointing": {
-                            "enabled": false,
-                            "pointing": {
-                                "angle1": 0,
-                                "angle2": 0,
-                                "direction_type": "J2000",
-                                "target": "_target_name_"
-                            }
+                            "calibrator": 0.523599,
+                            "target": 0.523599
                         },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -50400,
+                            "to": 50400
                         }
                     },
                     "time": {
-                        "at": "2023-04-13T09:59:00.00000Z",
                         "between": [],
                         "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 6
+                    "version": 4
                 },
                 "task_relations": [
+                    {
+                        "consumer": "Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -18882,7 +19553,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     }
                 ],
@@ -18894,24 +19565,24 @@
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     "Observation": {
-                        "description": "Fly's Eye observation with all available stations",
-                        "short_description": "IoS flys eye",
+                        "description": "Fly's Eye Observation with all stations",
+                        "short_description": "IPS FE1",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": false,
+                                    "enabled": true,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
-                                "inspection_plots": "dynspec",
+                                "inspection_plots": "msplots",
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": false,
-                                    "enabled": false
+                                    "enabled": true
                                 }
                             },
                             "beamformer": {
@@ -18965,9 +19636,57 @@
                                         "name": "FE",
                                         "station_groups": [
                                             {
-                                                "max_nr_missing": 0,
+                                                "max_nr_missing": 20,
                                                 "stations": [
-                                                    "CS007"
+                                                    "CS001",
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS032",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501",
+                                                    "RS106",
+                                                    "RS205",
+                                                    "RS208",
+                                                    "RS210",
+                                                    "RS305",
+                                                    "RS306",
+                                                    "RS307",
+                                                    "RS310",
+                                                    "RS406",
+                                                    "RS407",
+                                                    "RS409",
+                                                    "RS503",
+                                                    "RS508",
+                                                    "RS509",
+                                                    "DE601",
+                                                    "DE602",
+                                                    "DE603",
+                                                    "DE604",
+                                                    "DE605",
+                                                    "FR606",
+                                                    "SE607",
+                                                    "DE609",
+                                                    "PL610",
+                                                    "PL611",
+                                                    "PL612"
                                                 ]
                                             }
                                         ]
@@ -18980,80 +19699,154 @@
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
+                                            "angle1": 2.1598085883168996,
+                                            "angle2": 1.300007038906933,
                                             "direction_type": "J2000",
-                                            "target": "CasA"
+                                            "target": "B0809+74"
                                         },
-                                        "name": "FE_pointing1",
+                                        "name": "FE_pointing",
                                         "subbands": [
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            164,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
                                             195,
                                             196,
                                             197,
@@ -19186,38 +19979,273 @@
                                             324,
                                             325,
                                             326,
-                                            327
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 0,
+                                        "max_nr_missing": 20,
                                         "stations": [
-                                            "CS007"
+                                            "CS001",
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509",
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
+                                    "angle1": 2.1598085883168996,
+                                    "angle2": 1.300007038906933,
                                     "direction_type": "J2000",
-                                    "target": "_target_name_IPS_"
+                                    "target": "B0809+74"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 8
+                            "version": 6
+                        }
+                    },
+                    "Pipeline": {
+                        "description": "Pulsar Pipeline for Fly's Eye observation",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 38,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": true,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": true,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": false,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": true,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 6
                         }
                     }
                 }
             },
-            "version": 4,
+            "version": 5,
             "id": 19,
-            "state_value": "legacy",
+            "state_value": "development",
             "purpose_value": "technical_commissioning"
         },
         {
@@ -19226,9 +20254,9 @@
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 2
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
@@ -19289,7 +20317,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 6
                 },
                 "task_relations": [
                     {
@@ -19320,7 +20348,7 @@
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
-                            "version": 7
+                            "version": 6
                         }
                     },
                     "Observation": {
@@ -19641,9 +20669,9 @@
                     }
                 }
             },
-            "version": 5,
+            "version": 3,
             "id": 20,
-            "state_value": "active",
+            "state_value": "legacy",
             "purpose_value": "technical_commissioning"
         },
         {
@@ -19654,9 +20682,9 @@
                 "name": "scheduling unit",
                 "version": 2
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/2/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -19683,7 +20711,7 @@
                         "require_day": false,
                         "require_night": false
                     },
-                    "scheduler": "dynamic",
+                    "scheduler": "fixed_time",
                     "sky": {
                         "min_distance": {
                             "jupiter": 0.00872665,
@@ -19709,13 +20737,14 @@
                         }
                     },
                     "time": {
+                        "at": "2023-04-13T09:59:00.00000Z",
                         "between": [],
                         "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 6
                 },
                 "task_relations": [
                     {
@@ -19746,7 +20775,7 @@
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
-                            "version": 7
+                            "version": 6
                         }
                     },
                     "Observation": {
@@ -20067,15 +21096,15 @@
                     }
                 }
             },
-            "version": 6,
+            "version": 4,
             "id": 21,
-            "state_value": "active",
+            "state_value": "legacy",
             "purpose_value": "technical_commissioning"
         },
         {
-            "description": "This observation strategy template defines a single observation for holography station calibration",
-            "name": "Holography - 1 run",
-            "purpose": "system_health",
+            "description": "Test FE observation with one station",
+            "name": "FE RT test",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
                 "version": 8
@@ -20097,90 +21126,46 @@
                         ]
                     },
                     {
-                        "name": "Observation Description",
-                        "refs": [
-                            "#/tasks/Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline Description",
-                        "refs": [
-                            "#/tasks/Pipeline/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing",
-                        "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
-                        ]
-                    },
-                    {
-                        "name": "Subbands",
-                        "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
-                        ]
-                    },
-                    {
-                        "name": "Filter",
-                        "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
-                        ]
-                    },
-                    {
-                        "name": "Antenna Set",
-                        "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
-                        ]
-                    },
-                    {
-                        "name": "Target Duration",
+                        "name": "Duration FE1",
                         "refs": [
                             "#/tasks/Observation/specifications_doc/duration"
                         ]
-                    },
-                    {
-                        "name": "Time averaging steps",
-                        "refs": [
-                            "#/tasks/Pipeline/specifications_doc/average/time_steps"
-                        ]
-                    },
-                    {
-                        "name": "Frequency averaging steps",
-                        "refs": [
-                            "#/tasks/Pipeline/specifications_doc/average/frequency_steps"
-                        ]
-                    },
-                    {
-                        "name": "Flagging Strategy",
-                        "refs": [
-                            "#/tasks/Pipeline/specifications_doc/flag/rfi_strategy"
-                        ]
-                    },
-                    {
-                        "name": "Run Adder",
-                        "refs": [
-                            "#/tasks/Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Observation/specifications_doc/QA/file_conversion/enabled"
-                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.05235987756,
-                            "moon": 0.05235987756,
-                            "sun": 0.05235987756
+                            "jupiter": 0.00872665,
+                            "moon": 0.00872665,
+                            "sun": 0.00872665
                         },
                         "min_elevation": {
                             "calibrator": 0,
                             "target": 0
                         },
+                        "reference_pointing": {
+                            "enabled": false,
+                            "pointing": {
+                                "angle1": 0,
+                                "angle2": 0,
+                                "direction_type": "J2000",
+                                "target": "_target_name_"
+                            }
+                        },
                         "transit_offset": {
                             "from": -43200,
                             "to": 43200
                         }
+                    },
+                    "time": {
+                        "between": [],
+                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
@@ -20188,59 +21173,17 @@
                     "version": 7
                 },
                 "task_relations": [
-                    {
-                        "consumer": "Pipeline",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
                         },
                         "producer": "Observation",
                         "selection_doc": {},
@@ -20253,7 +21196,8 @@
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Cleanup": {
-                        "description": "Clean up all dataproducts from disk",
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "Cleanup",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -20261,8 +21205,8 @@
                         }
                     },
                     "Observation": {
-                        "description": "Observation",
-                        "short_description": "_Target_Name_",
+                        "description": "Fly's Eye observation with all available stations",
+                        "short_description": "IoS flys eye",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -20270,558 +21214,296 @@
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
-                                "inspection_plots": "msplots",
+                                "inspection_plots": "dynspec",
                                 "plots": {
                                     "autocorrelation": true,
-                                    "crosscorrelation": true,
+                                    "crosscorrelation": false,
                                     "enabled": false
                                 }
                             },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4"
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": true,
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "FE",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS007"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
                             },
-                            "duration": 30,
+                            "duration": 300,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
                                             "direction_type": "J2000",
-                                            "target": "target1"
+                                            "target": "CasA"
                                         },
-                                        "name": "target",
+                                        "name": "FE_pointing1",
                                         "subbands": [
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
                                             256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256,
-                                            256
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL",
-                                "filter": "HBA_110_190",
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 10,
+                                        "max_nr_missing": 0,
                                         "stations": [
-                                            "CS002",
-                                            "CS003",
-                                            "CS004",
-                                            "CS005",
-                                            "CS006",
-                                            "CS007",
-                                            "CS011",
-                                            "CS013",
-                                            "CS017",
-                                            "CS021",
-                                            "CS024",
-                                            "CS026",
-                                            "CS028",
-                                            "CS030",
-                                            "CS031",
-                                            "CS032",
-                                            "CS101",
-                                            "CS103",
-                                            "CS201",
-                                            "CS301",
-                                            "CS302",
-                                            "CS401",
-                                            "CS501",
-                                            "RS106",
-                                            "RS205",
-                                            "RS208",
-                                            "RS210",
-                                            "RS305",
-                                            "RS306",
-                                            "RS307",
-                                            "RS310",
-                                            "RS406",
-                                            "RS407",
-                                            "RS409",
-                                            "RS503",
-                                            "RS508",
-                                            "RS509"
+                                            "CS007"
                                         ]
                                     }
                                 ],
@@ -20829,64 +21511,38 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "target1"
+                                    "target": "_target_name_IPS_"
                                 }
                             }
                         },
                         "specifications_template": {
-                            "name": "target observation",
-                            "version": 9
-                        }
-                    },
-                    "Pipeline": {
-                        "description": "Preprocessing Pipeline for Observation",
-                        "short_description": "_Target_Name_/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 64,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
+                            "name": "beamforming observation",
                             "version": 8
                         }
                     }
                 }
             },
-            "version": 1,
+            "version": 5,
             "id": 22,
             "state_value": "active",
-            "purpose_value": "system_health"
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "IDOLS daytime observation on single station CS032, ingest, cleanup",
-            "name": "IDOLS daytime",
-            "purpose": "production",
+            "description": "Test FE observation with one station",
+            "name": "FE RT test",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 2
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/2/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -20896,42 +21552,44 @@
                         ]
                     },
                     {
-                        "name": "Duration",
-                        "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Description",
+                        "name": "Duration FE1",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/short_description"
+                            "#/tasks/Observation/specifications_doc/duration"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
                     "daily": {
                         "avoid_twilight": false,
-                        "require_day": true,
+                        "require_day": false,
                         "require_night": false
                     },
-                    "scheduler": "fixed_time",
+                    "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
+                            "jupiter": 0.00872665,
+                            "moon": 0.00872665,
+                            "sun": 0.00872665
                         },
                         "min_elevation": {
                             "calibrator": 0,
                             "target": 0
                         },
-                        "transit_offset": {
-                            "from": -43200,
+                        "reference_pointing": {
+                            "enabled": false,
+                            "pointing": {
+                                "angle1": 0,
+                                "angle2": 0,
+                                "direction_type": "J2000",
+                                "target": "_target_name_"
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -43200,
                             "to": 43200
                         }
                     },
                     "time": {
-                        "at": "2030-01-01T00:00:00Z",
                         "between": [],
                         "not_between": []
                     }
@@ -20953,15 +21611,440 @@
                             "datatype": "time series",
                             "role": "beamformer"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
                             "version": 6
                         }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "Cleanup",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Observation": {
+                        "description": "Fly's Eye observation with all available stations",
+                        "short_description": "IoS flys eye",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "dynspec",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": false,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": true,
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "FE",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS007"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 300,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "FE_pointing1",
+                                        "subbands": [
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS007"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_IPS_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    }
+                }
+            },
+            "version": 6,
+            "id": 23,
+            "state_value": "active",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "Fly's Eye Stokes I observation",
+            "name": "FE Stokes I - raw",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 10
+            },
+            "state": "active",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/station_groups"
+                        ]
                     },
                     {
-                        "consumer": "Ingest",
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Observing mode settings",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/flys eye/settings"
+                        ]
+                    },
+                    {
+                        "name": "Observation Short Description",
+                        "refs": [
+                            "#/tasks/Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -21600,
+                            "to": 21600
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 11
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "Beamformed",
                             "datatype": "time series",
@@ -20972,7 +22055,7 @@
                             "datatype": "time series",
                             "role": "beamformer"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -20982,911 +22065,40 @@
                 ],
                 "task_scheduling_relations": [],
                 "tasks": {
-                    "BF 1 station LBA": {
-                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
-                        "short_description": "Sun_spectrum_LBA-YYYYMMDD-runX",
+                    "Cleanup": {
+                        "description": "Cleanup all dataproducts from disk",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Observation": {
+                        "description": "Single station Fly's Eye observation",
+                        "short_description": "B1919+21",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
                             "beamformer": {
                                 "pipelines": [
                                     {
                                         "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP_Sun",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "SUN",
-                                                                "target": "Sun"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "name": "SAP_Cal",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "Calibrator"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 16,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "IQUV",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 16
                                             }
                                         },
-                                        "incoherent": {
-                                            "SAPs": [],
+                                        "flys eye": {
+                                            "enabled": true,
                                             "settings": {
-                                                "channels_per_subband": 1,
+                                                "channels_per_subband": 16,
                                                 "quantisation": {
                                                     "bits": 8,
                                                     "enabled": false,
@@ -21895,15 +22107,15 @@
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 16
                                             }
                                         },
-                                        "name": "CS_Sun",
+                                        "name": "Beamformer CV",
                                         "station_groups": [
                                             {
                                                 "max_nr_missing": 0,
                                                 "stations": [
-                                                    "CS032"
+                                                    "CS001"
                                                 ]
                                             }
                                         ]
@@ -21911,165 +22123,18 @@
                                 ],
                                 "ppf": false
                             },
-                            "duration": 660,
+                            "duration": 60,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0,
-                                            "angle2": 0,
-                                            "direction_type": "SUN",
-                                            "target": "Sun"
+                                            "angle1": 5.069077193263157,
+                                            "angle2": 0.38194712570414097,
+                                            "direction_type": "J2000",
+                                            "target": "B1919+21"
                                         },
-                                        "name": "SAP_Sun",
+                                        "name": "SAP0",
                                         "subbands": [
-                                            54,
-                                            55,
-                                            56,
-                                            57,
-                                            58,
-                                            59,
-                                            60,
-                                            61,
-                                            62,
-                                            63,
-                                            64,
-                                            65,
-                                            66,
-                                            67,
-                                            68,
-                                            69,
-                                            70,
-                                            71,
-                                            72,
-                                            73,
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            164,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
                                             201,
                                             202,
                                             203,
@@ -22269,175 +22334,25 @@
                                             397,
                                             398,
                                             399,
-                                            400,
-                                            401,
-                                            402,
-                                            403,
-                                            404,
-                                            405,
-                                            406,
-                                            407,
-                                            408,
-                                            409,
-                                            410,
-                                            411,
-                                            412,
-                                            413,
-                                            414,
-                                            415,
-                                            416,
-                                            417,
-                                            418,
-                                            419,
-                                            420,
-                                            421,
-                                            422,
-                                            423,
-                                            424,
-                                            425,
-                                            426,
-                                            427,
-                                            428,
-                                            429,
-                                            430,
-                                            431,
-                                            432,
-                                            433,
-                                            434,
-                                            435,
-                                            436,
-                                            437,
-                                            438,
-                                            439,
-                                            440,
-                                            441,
-                                            442,
-                                            443,
-                                            444,
-                                            445,
-                                            446,
-                                            447,
-                                            448,
-                                            449,
-                                            450,
-                                            451,
-                                            452,
-                                            453
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
-                                            "direction_type": "J2000",
-                                            "target": "CasA"
-                                        },
-                                        "name": "SAP_Cal",
-                                        "subbands": [
-                                            54,
-                                            80,
-                                            84,
-                                            88,
-                                            92,
-                                            96,
-                                            100,
-                                            104,
-                                            108,
-                                            112,
-                                            116,
-                                            120,
-                                            124,
-                                            128,
-                                            132,
-                                            136,
-                                            140,
-                                            144,
-                                            148,
-                                            152,
-                                            156,
-                                            160,
-                                            164,
-                                            168,
-                                            172,
-                                            176,
-                                            180,
-                                            184,
-                                            188,
-                                            192,
-                                            196,
-                                            200,
-                                            204,
-                                            208,
-                                            212,
-                                            216,
-                                            220,
-                                            224,
-                                            228,
-                                            232,
-                                            236,
-                                            240,
-                                            244,
-                                            248,
-                                            252,
-                                            256,
-                                            260,
-                                            264,
-                                            268,
-                                            272,
-                                            276,
-                                            280,
-                                            284,
-                                            288,
-                                            292,
-                                            296,
-                                            300,
-                                            304,
-                                            308,
-                                            312,
-                                            316,
-                                            320,
-                                            324,
-                                            328,
-                                            332,
-                                            336,
-                                            340,
-                                            344,
-                                            348,
-                                            352,
-                                            356,
-                                            360,
-                                            364,
-                                            368,
-                                            372,
-                                            376,
-                                            380,
-                                            384,
-                                            388,
-                                            392,
-                                            394,
-                                            396,
-                                            400,
-                                            404,
-                                            408,
-                                            412
+                                            400
                                         ]
                                     }
                                 ],
                                 "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 0,
                                         "stations": [
-                                            "CS032"
+                                            "CS001"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0,
-                                    "angle2": 0,
-                                    "direction_type": "SUN",
-                                    "target": "Sun"
+                                    "angle1": 5.069077193263157,
+                                    "angle2": 0.38194712570414097,
+                                    "direction_type": "J2000",
+                                    "target": "B1919+21"
                                 }
                             }
                         },
@@ -22445,48 +22360,30 @@
                             "name": "beamforming observation",
                             "version": 8
                         }
-                    },
-                    "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
                     }
                 }
             },
-            "version": 1,
-            "id": 23,
+            "version": 5,
+            "id": 24,
             "state_value": "active",
-            "purpose_value": "production"
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "IDOLS daytime observation on single station CS021, ingest, cleanup",
-            "name": "IDOLS daytime",
-            "purpose": "production",
+            "description": "Fly's Eye Stokes I observation with copy task",
+            "name": "FE Stokes I - raw with copy task",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -22498,51 +22395,64 @@
                     {
                         "name": "Duration",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                            "#/tasks/Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Description",
+                        "name": "Antenna Set",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/short_description"
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Observation Short Description",
+                        "refs": [
+                            "#/tasks/Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": true,
-                        "require_night": false
-                    },
-                    "scheduler": "fixed_time",
+                    "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
-                        },
-                        "min_elevation": {
-                            "calibrator": 0,
-                            "target": 0
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
+                            }
                         },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -21600,
+                            "to": 21600
                         }
-                    },
-                    "time": {
-                        "at": "2030-01-01T00:00:00Z",
-                        "between": [],
-                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "CopyTask",
                         "input": {
                             "dataformat": "Beamformed",
                             "datatype": "time series",
@@ -22553,7 +22463,7 @@
                             "datatype": "time series",
                             "role": "beamformer"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -22561,7 +22471,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "Beamformed",
                             "datatype": "time series",
@@ -22572,7 +22482,7 @@
                             "datatype": "time series",
                             "role": "beamformer"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -22582,911 +22492,53 @@
                 ],
                 "task_scheduling_relations": [],
                 "tasks": {
-                    "BF 1 station LBA": {
-                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
-                        "short_description": "Sun_spectrum_LBA-YYYYMMDD-runX",
+                    "Cleanup": {
+                        "description": "Cleanup all dataproducts from disk",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "CopyTask": {
+                        "description": "Copy the observation output to drg20",
+                        "short_description": "copy",
+                        "specifications_doc": {
+                            "destination": "drg20-10g.online.lofar:/data1/bassa/l2ts",
+                            "group_by_id": true,
+                            "managed_output": false
+                        },
+                        "specifications_template": {
+                            "name": "copy pipeline",
+                            "version": 1
+                        }
+                    },
+                    "Observation": {
+                        "description": "Single station Fly's Eye observation",
+                        "short_description": "B1919+21",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
                             "beamformer": {
                                 "pipelines": [
                                     {
                                         "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP_Sun",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "SUN",
-                                                                "target": "Sun"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "name": "SAP_Cal",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "Calibrator"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 16,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "IQUV",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 16
                                             }
                                         },
-                                        "incoherent": {
-                                            "SAPs": [],
+                                        "flys eye": {
+                                            "enabled": true,
                                             "settings": {
-                                                "channels_per_subband": 1,
+                                                "channels_per_subband": 16,
                                                 "quantisation": {
                                                     "bits": 8,
                                                     "enabled": false,
@@ -23495,15 +22547,15 @@
                                                 },
                                                 "stokes": "I",
                                                 "subbands_per_file": 488,
-                                                "time_integration_factor": 1
+                                                "time_integration_factor": 16
                                             }
                                         },
-                                        "name": "CS_Sun",
+                                        "name": "Beamformer CV",
                                         "station_groups": [
                                             {
                                                 "max_nr_missing": 0,
                                                 "stations": [
-                                                    "CS021"
+                                                    "CS001"
                                                 ]
                                             }
                                         ]
@@ -23511,165 +22563,18 @@
                                 ],
                                 "ppf": false
                             },
-                            "duration": 660,
+                            "duration": 60,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0,
-                                            "angle2": 0,
-                                            "direction_type": "SUN",
-                                            "target": "Sun"
+                                            "angle1": 5.069077193263157,
+                                            "angle2": 0.38194712570414097,
+                                            "direction_type": "J2000",
+                                            "target": "B1919+21"
                                         },
-                                        "name": "SAP_Sun",
+                                        "name": "SAP0",
                                         "subbands": [
-                                            54,
-                                            55,
-                                            56,
-                                            57,
-                                            58,
-                                            59,
-                                            60,
-                                            61,
-                                            62,
-                                            63,
-                                            64,
-                                            65,
-                                            66,
-                                            67,
-                                            68,
-                                            69,
-                                            70,
-                                            71,
-                                            72,
-                                            73,
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            164,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
                                             201,
                                             202,
                                             203,
@@ -23869,175 +22774,25 @@
                                             397,
                                             398,
                                             399,
-                                            400,
-                                            401,
-                                            402,
-                                            403,
-                                            404,
-                                            405,
-                                            406,
-                                            407,
-                                            408,
-                                            409,
-                                            410,
-                                            411,
-                                            412,
-                                            413,
-                                            414,
-                                            415,
-                                            416,
-                                            417,
-                                            418,
-                                            419,
-                                            420,
-                                            421,
-                                            422,
-                                            423,
-                                            424,
-                                            425,
-                                            426,
-                                            427,
-                                            428,
-                                            429,
-                                            430,
-                                            431,
-                                            432,
-                                            433,
-                                            434,
-                                            435,
-                                            436,
-                                            437,
-                                            438,
-                                            439,
-                                            440,
-                                            441,
-                                            442,
-                                            443,
-                                            444,
-                                            445,
-                                            446,
-                                            447,
-                                            448,
-                                            449,
-                                            450,
-                                            451,
-                                            452,
-                                            453
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
-                                            "direction_type": "J2000",
-                                            "target": "CasA"
-                                        },
-                                        "name": "SAP_Cal",
-                                        "subbands": [
-                                            54,
-                                            80,
-                                            84,
-                                            88,
-                                            92,
-                                            96,
-                                            100,
-                                            104,
-                                            108,
-                                            112,
-                                            116,
-                                            120,
-                                            124,
-                                            128,
-                                            132,
-                                            136,
-                                            140,
-                                            144,
-                                            148,
-                                            152,
-                                            156,
-                                            160,
-                                            164,
-                                            168,
-                                            172,
-                                            176,
-                                            180,
-                                            184,
-                                            188,
-                                            192,
-                                            196,
-                                            200,
-                                            204,
-                                            208,
-                                            212,
-                                            216,
-                                            220,
-                                            224,
-                                            228,
-                                            232,
-                                            236,
-                                            240,
-                                            244,
-                                            248,
-                                            252,
-                                            256,
-                                            260,
-                                            264,
-                                            268,
-                                            272,
-                                            276,
-                                            280,
-                                            284,
-                                            288,
-                                            292,
-                                            296,
-                                            300,
-                                            304,
-                                            308,
-                                            312,
-                                            316,
-                                            320,
-                                            324,
-                                            328,
-                                            332,
-                                            336,
-                                            340,
-                                            344,
-                                            348,
-                                            352,
-                                            356,
-                                            360,
-                                            364,
-                                            368,
-                                            372,
-                                            376,
-                                            380,
-                                            384,
-                                            388,
-                                            392,
-                                            394,
-                                            396,
-                                            400,
-                                            404,
-                                            408,
-                                            412
+                                            400
                                         ]
                                     }
                                 ],
                                 "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 0,
                                         "stations": [
-                                            "CS021"
+                                            "CS001"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0,
-                                    "angle2": 0,
-                                    "direction_type": "SUN",
-                                    "target": "Sun"
+                                    "angle1": 5.069077193263157,
+                                    "angle2": 0.38194712570414097,
+                                    "direction_type": "J2000",
+                                    "target": "B1919+21"
                                 }
                             }
                         },
@@ -24045,48 +22800,30 @@
                             "name": "beamforming observation",
                             "version": 8
                         }
-                    },
-                    "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
                     }
                 }
             },
             "version": 2,
-            "id": 24,
+            "id": 25,
             "state_value": "active",
-            "purpose_value": "production"
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "IDOLS nighttime observation on single station CS032, ingest, cleanup",
-            "name": "IDOLS nighttime",
-            "purpose": "production",
+            "description": "This observation strategy template defines a single observation for holography station calibration",
+            "name": "Holography - 1 run",
+            "purpose": "system_health",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -24096,73 +22833,135 @@
                         ]
                     },
                     {
-                        "name": "Duration",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                            "#/tasks/Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Description",
+                        "name": "Pipeline Description",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/short_description"
+                            "#/tasks/Pipeline/short_description"
                         ]
-                    }
-                ],
-                "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
                     },
-                    "scheduler": "fixed_time",
-                    "sky": {
-                        "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
-                        },
-                        "min_elevation": {
-                            "calibrator": 0,
-                            "target": 0
-                        },
-                        "reference_pointing": {
-                            "enabled": false,
-                            "pointing": {
-                                "angle1": 0,
-                                "angle2": 0,
-                                "direction_type": "J2000",
-                                "target": "_target_name_"
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Time averaging steps",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/average/time_steps"
+                        ]
+                    },
+                    {
+                        "name": "Frequency averaging steps",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/average/frequency_steps"
+                        ]
+                    },
+                    {
+                        "name": "Flagging Strategy",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/flag/rfi_strategy"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "target": {
+                                "jupiter": 0.05235987756,
+                                "moon": 0.05235987756,
+                                "sun": 0.05235987756
                             }
                         },
+                        "min_elevation": {
+                            "calibrator": 0,
+                            "target": 0
+                        },
                         "transit_offset": {
                             "from": -43200,
                             "to": 43200
                         }
-                    },
-                    "time": {
-                        "at": "2030-01-01T00:00:00Z",
-                        "between": [],
-                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
+                    {
+                        "consumer": "Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -24170,18 +22969,18 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
                         "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -24191,9 +22990,17 @@
                 ],
                 "task_scheduling_relations": [],
                 "tasks": {
-                    "BF 1 station LBA": {
-                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
-                        "short_description": "IDOLS_nighttime_spectrum_LBA-YYYYMMDD-runX",
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Observation": {
+                        "description": "Observation",
+                        "short_description": "_Target_Name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -24208,1431 +23015,12150 @@
                                     "enabled": false
                                 }
                             },
-                            "beamformer": {
-                                "pipelines": [
-                                    {
-                                        "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP_Cal",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "Calibrator"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 16,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "IQUV",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "name": "CS_Sun",
-                                        "station_groups": [
-                                            {
-                                                "max_nr_missing": 0,
-                                                "stations": [
-                                                    "CS032"
-                                                ]
-                                            }
-                                        ]
-                                    }
-                                ],
-                                "ppf": false
-                            },
-                            "duration": 660,
-                            "station_configuration": {
-                                "SAPs": [
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 30,
+                            "station_configuration": {
+                                "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "CasA"
+                                            "target": "target1"
                                         },
-                                        "name": "SAP_Cal",
+                                        "name": "target",
                                         "subbands": [
-                                            54,
-                                            80,
-                                            84,
-                                            88,
-                                            92,
-                                            96,
-                                            100,
-                                            104,
-                                            108,
-                                            112,
-                                            116,
-                                            120,
-                                            124,
-                                            128,
-                                            132,
-                                            136,
-                                            140,
-                                            144,
-                                            148,
-                                            152,
-                                            156,
-                                            160,
-                                            164,
-                                            168,
-                                            172,
-                                            176,
-                                            180,
-                                            184,
-                                            188,
-                                            192,
-                                            196,
-                                            200,
-                                            204,
-                                            208,
-                                            212,
-                                            216,
-                                            220,
-                                            224,
-                                            228,
-                                            232,
-                                            236,
-                                            240,
-                                            244,
-                                            248,
-                                            252,
                                             256,
-                                            260,
-                                            264,
-                                            268,
-                                            272,
-                                            276,
-                                            280,
-                                            284,
-                                            288,
-                                            292,
-                                            296,
-                                            300,
-                                            304,
-                                            308,
-                                            312,
-                                            316,
-                                            320,
-                                            324,
-                                            328,
-                                            332,
-                                            336,
-                                            340,
-                                            344,
-                                            348,
-                                            352,
-                                            356,
-                                            360,
-                                            364,
-                                            368,
-                                            372,
-                                            376,
-                                            380,
-                                            384,
-                                            388,
-                                            392,
-                                            394,
-                                            396,
-                                            400,
-                                            404,
-                                            408,
-                                            412
-                                        ]
-                                    }
-                                ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
-                                "station_groups": [
-                                    {
-                                        "max_nr_missing": 0,
-                                        "stations": [
-                                            "CS032"
-                                        ]
-                                    }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0,
-                                    "angle2": 0,
-                                    "direction_type": "SUN",
-                                    "target": "Sun"
-                                }
-                            }
-                        },
-                        "specifications_template": {
-                            "name": "beamforming observation",
-                            "version": 8
-                        }
-                    },
-                    "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    }
-                }
-            },
-            "version": 1,
-            "id": 25,
-            "state_value": "active",
-            "purpose_value": "production"
-        },
-        {
-            "description": "IDOLS nighttime observation on single station CS032, ingest, cleanup",
-            "name": "IDOLS nighttime",
-            "purpose": "production",
-            "scheduling_unit_template": {
-                "name": "scheduling unit",
-                "version": 5
-            },
-            "state": "active",
-            "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
-                "parameters": [
-                    {
-                        "name": "Stations",
-                        "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
-                        ]
-                    },
-                    {
-                        "name": "Scheduling Constraints",
-                        "refs": [
-                            "#/scheduling_constraints_doc"
-                        ]
-                    },
-                    {
-                        "name": "Duration",
-                        "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Description",
-                        "refs": [
-                            "#/tasks/BF 1 station LBA/short_description"
-                        ]
-                    }
-                ],
-                "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
-                    "scheduler": "fixed_time",
-                    "sky": {
-                        "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
-                        },
-                        "min_elevation": {
-                            "calibrator": 0,
-                            "target": 0
-                        },
-                        "reference_pointing": {
-                            "enabled": false,
-                            "pointing": {
-                                "angle1": 0,
-                                "angle2": 0,
-                                "direction_type": "J2000",
-                                "target": "_target_name_"
-                            }
-                        },
-                        "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
-                        }
-                    },
-                    "time": {
-                        "at": "2030-01-01T00:00:00Z",
-                        "between": [],
-                        "not_between": []
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "BF 1 station LBA",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "BF 1 station LBA",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [],
-                "tasks": {
-                    "BF 1 station LBA": {
-                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
-                        "short_description": "IDOLS_nighttime_LBA-YYYYMMDD",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "beamformer": {
-                                "pipelines": [
-                                    {
-                                        "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP_Cal",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "Calibrator"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 16,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "IQUV",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "name": "CS_Sun",
-                                        "station_groups": [
-                                            {
-                                                "max_nr_missing": 0,
-                                                "stations": [
-                                                    "CS032"
-                                                ]
-                                            }
-                                        ]
-                                    }
-                                ],
-                                "ppf": false
-                            },
-                            "duration": 660,
-                            "station_configuration": {
-                                "SAPs": [
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
-                                            "direction_type": "J2000",
-                                            "target": "CasA"
-                                        },
-                                        "name": "SAP_Cal",
-                                        "subbands": [
-                                            54,
-                                            80,
-                                            84,
-                                            88,
-                                            92,
-                                            96,
-                                            100,
-                                            104,
-                                            108,
-                                            112,
-                                            116,
-                                            120,
-                                            124,
-                                            128,
-                                            132,
-                                            136,
-                                            140,
-                                            144,
-                                            148,
-                                            152,
-                                            156,
-                                            160,
-                                            164,
-                                            168,
-                                            172,
-                                            176,
-                                            180,
-                                            184,
-                                            188,
-                                            192,
-                                            196,
-                                            200,
-                                            204,
-                                            208,
-                                            212,
-                                            216,
-                                            220,
-                                            224,
-                                            228,
-                                            232,
-                                            236,
-                                            240,
-                                            244,
-                                            248,
-                                            252,
                                             256,
-                                            260,
-                                            264,
-                                            268,
-                                            272,
-                                            276,
-                                            280,
-                                            284,
-                                            288,
-                                            292,
-                                            296,
-                                            300,
-                                            304,
-                                            308,
-                                            312,
-                                            316,
-                                            320,
-                                            324,
-                                            328,
-                                            332,
-                                            336,
-                                            340,
-                                            344,
-                                            348,
-                                            352,
-                                            356,
-                                            360,
-                                            364,
-                                            368,
-                                            372,
-                                            376,
-                                            380,
-                                            384,
-                                            388,
-                                            392,
-                                            394,
-                                            396,
-                                            400,
-                                            404,
-                                            408,
-                                            412
-                                        ]
-                                    }
-                                ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
-                                "station_groups": [
-                                    {
-                                        "max_nr_missing": 0,
-                                        "stations": [
-                                            "CS032"
-                                        ]
-                                    }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0,
-                                    "angle2": 0,
-                                    "direction_type": "SUN",
-                                    "target": "Sun"
-                                }
-                            }
-                        },
-                        "specifications_template": {
-                            "name": "beamforming observation",
-                            "version": 8
-                        }
-                    },
-                    "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "",
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256,
+                                            256
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 10,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "target1"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "target observation",
+                            "version": 9
+                        }
+                    },
+                    "Pipeline": {
+                        "description": "Preprocessing Pipeline for Observation",
+                        "short_description": "_Target_Name_/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 64,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 26,
+            "state_value": "active",
+            "purpose_value": "system_health"
+        },
+        {
+            "description": "IDOLS daytime observation on single station CS032, ingest, cleanup",
+            "name": "IDOLS daytime",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 5
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Description",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/short_description"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": true,
+                        "require_night": false
+                    },
+                    "scheduler": "fixed_time",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0,
+                            "sun": 0
+                        },
+                        "min_elevation": {
+                            "calibrator": 0,
+                            "target": 0
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    },
+                    "time": {
+                        "at": "2030-01-01T00:00:00Z",
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "BF 1 station LBA": {
+                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "Sun_spectrum_LBA-YYYYMMDD-runX",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP_Sun",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "SUN",
+                                                                "target": "Sun"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                },
+                                                {
+                                                    "name": "SAP_Cal",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "Calibrator"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS032"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 660,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0,
+                                            "angle2": 0,
+                                            "direction_type": "SUN",
+                                            "target": "Sun"
+                                        },
+                                        "name": "SAP_Sun",
+                                        "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "SAP_Cal",
+                                        "subbands": [
+                                            54,
+                                            80,
+                                            84,
+                                            88,
+                                            92,
+                                            96,
+                                            100,
+                                            104,
+                                            108,
+                                            112,
+                                            116,
+                                            120,
+                                            124,
+                                            128,
+                                            132,
+                                            136,
+                                            140,
+                                            144,
+                                            148,
+                                            152,
+                                            156,
+                                            160,
+                                            164,
+                                            168,
+                                            172,
+                                            176,
+                                            180,
+                                            184,
+                                            188,
+                                            192,
+                                            196,
+                                            200,
+                                            204,
+                                            208,
+                                            212,
+                                            216,
+                                            220,
+                                            224,
+                                            228,
+                                            232,
+                                            236,
+                                            240,
+                                            244,
+                                            248,
+                                            252,
+                                            256,
+                                            260,
+                                            264,
+                                            268,
+                                            272,
+                                            276,
+                                            280,
+                                            284,
+                                            288,
+                                            292,
+                                            296,
+                                            300,
+                                            304,
+                                            308,
+                                            312,
+                                            316,
+                                            320,
+                                            324,
+                                            328,
+                                            332,
+                                            336,
+                                            340,
+                                            344,
+                                            348,
+                                            352,
+                                            356,
+                                            360,
+                                            364,
+                                            368,
+                                            372,
+                                            376,
+                                            380,
+                                            384,
+                                            388,
+                                            392,
+                                            394,
+                                            396,
+                                            400,
+                                            404,
+                                            408,
+                                            412
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS032"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 27,
+            "state_value": "legacy",
+            "purpose_value": "production"
+        },
+        {
+            "description": "IDOLS daytime observation on single station CS021, ingest, cleanup",
+            "name": "IDOLS daytime",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 10
+            },
+            "state": "active",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Description",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/short_description"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": true,
+                        "require_night": false
+                    },
+                    "scheduler": "fixed_time",
+                    "sky": {
+                        "min_distance": {
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0,
+                                "sun": 0
+                            }
+                        },
+                        "min_elevation": {
+                            "calibrator": 0,
+                            "target": 0
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    },
+                    "time": {
+                        "at": "2030-01-01T00:00:00Z",
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 11
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "BF 1 station LBA": {
+                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "Sun_spectrum_LBA-YYYYMMDD-runX",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP_Sun",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "SUN",
+                                                                "target": "Sun"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                },
+                                                {
+                                                    "name": "SAP_Cal",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "Calibrator"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS021"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 660,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0,
+                                            "angle2": 0,
+                                            "direction_type": "SUN",
+                                            "target": "Sun"
+                                        },
+                                        "name": "SAP_Sun",
+                                        "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "SAP_Cal",
+                                        "subbands": [
+                                            54,
+                                            80,
+                                            84,
+                                            88,
+                                            92,
+                                            96,
+                                            100,
+                                            104,
+                                            108,
+                                            112,
+                                            116,
+                                            120,
+                                            124,
+                                            128,
+                                            132,
+                                            136,
+                                            140,
+                                            144,
+                                            148,
+                                            152,
+                                            156,
+                                            160,
+                                            164,
+                                            168,
+                                            172,
+                                            176,
+                                            180,
+                                            184,
+                                            188,
+                                            192,
+                                            196,
+                                            200,
+                                            204,
+                                            208,
+                                            212,
+                                            216,
+                                            220,
+                                            224,
+                                            228,
+                                            232,
+                                            236,
+                                            240,
+                                            244,
+                                            248,
+                                            252,
+                                            256,
+                                            260,
+                                            264,
+                                            268,
+                                            272,
+                                            276,
+                                            280,
+                                            284,
+                                            288,
+                                            292,
+                                            296,
+                                            300,
+                                            304,
+                                            308,
+                                            312,
+                                            316,
+                                            320,
+                                            324,
+                                            328,
+                                            332,
+                                            336,
+                                            340,
+                                            344,
+                                            348,
+                                            352,
+                                            356,
+                                            360,
+                                            364,
+                                            368,
+                                            372,
+                                            376,
+                                            380,
+                                            384,
+                                            388,
+                                            392,
+                                            394,
+                                            396,
+                                            400,
+                                            404,
+                                            408,
+                                            412
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS021"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    }
+                }
+            },
+            "version": 2,
+            "id": 28,
+            "state_value": "active",
+            "purpose_value": "production"
+        },
+        {
+            "description": "IDOLS nighttime observation on single station CS032, ingest, cleanup",
+            "name": "IDOLS nighttime",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 8
+            },
+            "state": "active",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Description",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/short_description"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "scheduler": "fixed_time",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0,
+                            "sun": 0
+                        },
+                        "min_elevation": {
+                            "calibrator": 0,
+                            "target": 0
+                        },
+                        "reference_pointing": {
+                            "enabled": false,
+                            "pointing": {
+                                "angle1": 0,
+                                "angle2": 0,
+                                "direction_type": "J2000",
+                                "target": "_target_name_"
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    },
+                    "time": {
+                        "at": "2030-01-01T00:00:00Z",
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "BF 1 station LBA": {
+                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "IDOLS_nighttime_spectrum_LBA-YYYYMMDD-runX",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP_Cal",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "Calibrator"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS032"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 660,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "SAP_Cal",
+                                        "subbands": [
+                                            54,
+                                            80,
+                                            84,
+                                            88,
+                                            92,
+                                            96,
+                                            100,
+                                            104,
+                                            108,
+                                            112,
+                                            116,
+                                            120,
+                                            124,
+                                            128,
+                                            132,
+                                            136,
+                                            140,
+                                            144,
+                                            148,
+                                            152,
+                                            156,
+                                            160,
+                                            164,
+                                            168,
+                                            172,
+                                            176,
+                                            180,
+                                            184,
+                                            188,
+                                            192,
+                                            196,
+                                            200,
+                                            204,
+                                            208,
+                                            212,
+                                            216,
+                                            220,
+                                            224,
+                                            228,
+                                            232,
+                                            236,
+                                            240,
+                                            244,
+                                            248,
+                                            252,
+                                            256,
+                                            260,
+                                            264,
+                                            268,
+                                            272,
+                                            276,
+                                            280,
+                                            284,
+                                            288,
+                                            292,
+                                            296,
+                                            300,
+                                            304,
+                                            308,
+                                            312,
+                                            316,
+                                            320,
+                                            324,
+                                            328,
+                                            332,
+                                            336,
+                                            340,
+                                            344,
+                                            348,
+                                            352,
+                                            356,
+                                            360,
+                                            364,
+                                            368,
+                                            372,
+                                            376,
+                                            380,
+                                            384,
+                                            388,
+                                            392,
+                                            394,
+                                            396,
+                                            400,
+                                            404,
+                                            408,
+                                            412
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS032"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 29,
+            "state_value": "active",
+            "purpose_value": "production"
+        },
+        {
+            "description": "IDOLS nighttime observation on single station CS032, ingest, cleanup",
+            "name": "IDOLS nighttime",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 5
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Description",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/short_description"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "scheduler": "fixed_time",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0,
+                            "sun": 0
+                        },
+                        "min_elevation": {
+                            "calibrator": 0,
+                            "target": 0
+                        },
+                        "reference_pointing": {
+                            "enabled": false,
+                            "pointing": {
+                                "angle1": 0,
+                                "angle2": 0,
+                                "direction_type": "J2000",
+                                "target": "_target_name_"
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    },
+                    "time": {
+                        "at": "2030-01-01T00:00:00Z",
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "BF 1 station LBA": {
+                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "IDOLS_nighttime_LBA-YYYYMMDD",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP_Cal",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "Calibrator"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS032"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 660,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "SAP_Cal",
+                                        "subbands": [
+                                            54,
+                                            80,
+                                            84,
+                                            88,
+                                            92,
+                                            96,
+                                            100,
+                                            104,
+                                            108,
+                                            112,
+                                            116,
+                                            120,
+                                            124,
+                                            128,
+                                            132,
+                                            136,
+                                            140,
+                                            144,
+                                            148,
+                                            152,
+                                            156,
+                                            160,
+                                            164,
+                                            168,
+                                            172,
+                                            176,
+                                            180,
+                                            184,
+                                            188,
+                                            192,
+                                            196,
+                                            200,
+                                            204,
+                                            208,
+                                            212,
+                                            216,
+                                            220,
+                                            224,
+                                            228,
+                                            232,
+                                            236,
+                                            240,
+                                            244,
+                                            248,
+                                            252,
+                                            256,
+                                            260,
+                                            264,
+                                            268,
+                                            272,
+                                            276,
+                                            280,
+                                            284,
+                                            288,
+                                            292,
+                                            296,
+                                            300,
+                                            304,
+                                            308,
+                                            312,
+                                            316,
+                                            320,
+                                            324,
+                                            328,
+                                            332,
+                                            336,
+                                            340,
+                                            344,
+                                            348,
+                                            352,
+                                            356,
+                                            360,
+                                            364,
+                                            368,
+                                            372,
+                                            376,
+                                            380,
+                                            384,
+                                            388,
+                                            392,
+                                            394,
+                                            396,
+                                            400,
+                                            404,
+                                            408,
+                                            412
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS032"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    }
+                }
+            },
+            "version": 2,
+            "id": 30,
+            "state_value": "legacy",
+            "purpose_value": "production"
+        },
+        {
+            "description": "IDOLS nighttime observation on single station CS021, ingest, cleanup",
+            "name": "IDOLS nighttime",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 10
+            },
+            "state": "active",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Description",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/short_description"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "scheduler": "fixed_time",
+                    "sky": {
+                        "min_distance": {
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0,
+                                "sun": 0
+                            }
+                        },
+                        "min_elevation": {
+                            "calibrator": 0,
+                            "target": 0
+                        },
+                        "reference_pointing": {
+                            "enabled": false,
+                            "pointing": {
+                                "angle1": 0,
+                                "angle2": 0,
+                                "direction_type": "J2000",
+                                "target": "_target_name_"
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    },
+                    "time": {
+                        "at": "2030-01-01T00:00:00Z",
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 11
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "BF 1 station LBA": {
+                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "IDOLS_nighttime_LBA-YYYYMMDD",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP_Cal",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "allow_after_previous": true,
+                                                            "duration": 0,
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "Calibrator"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "CS021"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 660,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "SAP_Cal",
+                                        "subbands": [
+                                            54,
+                                            80,
+                                            84,
+                                            88,
+                                            92,
+                                            96,
+                                            100,
+                                            104,
+                                            108,
+                                            112,
+                                            116,
+                                            120,
+                                            124,
+                                            128,
+                                            132,
+                                            136,
+                                            140,
+                                            144,
+                                            148,
+                                            152,
+                                            156,
+                                            160,
+                                            164,
+                                            168,
+                                            172,
+                                            176,
+                                            180,
+                                            184,
+                                            188,
+                                            192,
+                                            196,
+                                            200,
+                                            204,
+                                            208,
+                                            212,
+                                            216,
+                                            220,
+                                            224,
+                                            228,
+                                            232,
+                                            236,
+                                            240,
+                                            244,
+                                            248,
+                                            252,
+                                            256,
+                                            260,
+                                            264,
+                                            268,
+                                            272,
+                                            276,
+                                            280,
+                                            284,
+                                            288,
+                                            292,
+                                            296,
+                                            300,
+                                            304,
+                                            308,
+                                            312,
+                                            316,
+                                            320,
+                                            324,
+                                            328,
+                                            332,
+                                            336,
+                                            340,
+                                            344,
+                                            348,
+                                            352,
+                                            356,
+                                            360,
+                                            364,
+                                            368,
+                                            372,
+                                            376,
+                                            380,
+                                            384,
+                                            388,
+                                            392,
+                                            394,
+                                            396,
+                                            400,
+                                            404,
+                                            408,
+                                            412
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS021"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    }
+                }
+            },
+            "version": 3,
+            "id": 31,
+            "state_value": "active",
+            "purpose_value": "production"
+        },
+        {
+            "description": "This observation strategy template defines an IM + BF observation (calibrator-target-calibrator, single TAB recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
+            "name": "IM + BF 1 CV - 8 bit",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 7
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Target pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tile beam pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Target Observation Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Target Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Target Description",
+                        "refs": [
+                            "#/tasks/Pipeline target/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pulsar Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pulsar Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline 1 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
+                        "transit_offset": {
+                            "from": -21600,
+                            "to": 21600
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Pulsar Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline 1",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline 2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "SAP"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation 1",
+                        "placement": "before",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "Calibrator Observation 2",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation 1": {
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600,
+                            "use_target_beamformer": false
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator2",
+                                "pointing": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600,
+                            "use_target_beamformer": false
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "Cal1 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "Cal2 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pulsar Pipeline": {
+                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": true,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 6
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP",
+                                                    "subbands": {
+                                                        "list": [],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "_beamformer_name_",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 6,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS032",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.9293396170466985,
+                                            "angle2": 0.9525862980765968,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_"
+                                        },
+                                        "name": "SAP",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 6,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "parallel target and beamforming observation",
+                            "version": 3
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 32,
+            "state_value": "legacy",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "This observation strategy template defines a Rapid Response IM + BF observation (target-calibrator, two TABs recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
+            "name": "IM + BF 2 CV - 8 bit",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 7
+            },
+            "state": "development",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pipeline target/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pulsar Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Pulsar Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "SAP"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation": {
+                        "description": "Calibrator Observation. After the Target Observation",
+                        "short_description": "Cal 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600,
+                            "use_target_beamformer": false
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "Cal 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pulsar Pipeline": {
+                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": true,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 9
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP",
+                                                    "subbands": {
+                                                        "list": [],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0.0002908882087,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "_beamformer_name_",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 6,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_"
+                                        },
+                                        "name": "SAP",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 6,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "parallel target and beamforming observation",
+                            "version": 3
+                        }
+                    }
+                }
+            },
+            "version": 15,
+            "id": 33,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "This observation strategy template defines a Rapid Response IM + BF observation (target-calibrator, two TABs recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
+            "name": "IM + BF 2 CV - 8 bit",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 7
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pipeline target/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pulsar Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0.0174444444444444,
+                            "sun": 0.0872222222222222
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Pulsar Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "SAP"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation": {
+                        "description": "Calibrator Observation. After the Target Observation",
+                        "short_description": "Cal 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600,
+                            "use_target_beamformer": false
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "Cal 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 9
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 9
+                        }
+                    },
+                    "Pulsar Pipeline": {
+                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": true,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 9
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP",
+                                                    "subbands": {
+                                                        "list": [],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0.0002908882087,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "_beamformer_name_",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 6,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_"
+                                        },
+                                        "name": "SAP",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 6,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "parallel target and beamforming observation",
+                            "version": 3
+                        }
+                    }
+                }
+            },
+            "version": 16,
+            "id": 34,
+            "state_value": "legacy",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "This observation strategy template defines a Rapid Response IM + BF observation (target-calibrator, four TABs recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
+            "name": "IM + BF 4 CV - 8 bit",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 7
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Target pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tile beam pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 0 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/0/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 0 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/0/relative"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 1 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/1/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 1 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/1/relative"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 2 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/2/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 2 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/2/relative"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 3 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/3/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 3 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/3/relative"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pipeline target/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pulsar Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
+                        "transit_offset": {
+                            "from": -21600,
+                            "to": 21600
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Pulsar Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "SAP"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation": {
+                        "description": "Calibrator Observation. After the Target Observation",
+                        "short_description": "Cal 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "Cal 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pulsar Pipeline": {
+                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": true,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 6
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP",
+                                                    "subbands": {
+                                                        "list": [],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "_beamformer_name_",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 6,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS032",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.9293396170466985,
+                                            "angle2": 0.9525862980765968,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_"
+                                        },
+                                        "name": "SAP",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 6,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "parallel target and beamforming observation",
+                            "version": 3
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 35,
+            "state_value": "legacy",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "This observation strategy template defines a Rapid Response IM + BF observation (target-calibrator, four TABs recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
+            "name": "IM + BF 4 CV - 8 bit",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 7
+            },
+            "state": "development",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Target pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tile beam pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 0 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/0/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 0 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/0/relative"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 1 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/1/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 1 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/1/relative"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 2 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/2/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 2 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/2/relative"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 3 pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/3/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Tied-array beam 3 relation",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/3/relative"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pipeline target/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pulsar Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
+                        "transit_offset": {
+                            "from": -21600,
+                            "to": 21600
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Pulsar Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "Pulsar Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "SAP"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation": {
+                        "description": "Calibrator Observation. After the Target Observation",
+                        "short_description": "Cal 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600,
+                            "use_target_beamformer": false
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "Cal 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pulsar Pipeline": {
+                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": true,
+                                    "scale": 5
+                                }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
+                        },
+                        "specifications_template": {
+                            "name": "pulsar pipeline",
+                            "version": 6
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP",
+                                                    "subbands": {
+                                                        "list": [],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        },
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OffTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "_beamformer_name_",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 6,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS032",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.9293396170466985,
+                                            "angle2": 0.9525862980765968,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_"
+                                        },
+                                        "name": "SAP",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 6,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.9293396170466985,
+                                    "angle2": 0.9525862980765968,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "parallel target and beamforming observation",
+                            "version": 3
+                        }
+                    }
+                }
+            },
+            "version": 3,
+            "id": 36,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "Generic imaging observation with pipeline and ingest with 1 beam, no calibrator",
+            "name": "IM general - 1 beam",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 8
+            },
+            "state": "development",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Description",
+                        "refs": [
+                            "#/tasks/Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Time averaging steps",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/average/time_steps"
+                        ]
+                    },
+                    {
+                        "name": "Frequency averaging steps",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/average/frequency_steps"
+                        ]
+                    },
+                    {
+                        "name": "Flagging Strategy",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/flag/rfi_strategy"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "location": "center",
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0.12217304763960307,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.6981317007977318
+                        },
+                        "reference_pointing": {
+                            "enabled": false,
+                            "pointing": {
+                                "angle1": 0,
+                                "angle2": 0,
+                                "direction_type": "J2000",
+                                "target": "_target_name_"
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -7200,
+                            "to": 7200
+                        }
+                    },
+                    "time": {
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 9
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "short_description": "",
                         "specifications_doc": {},
                         "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Observation": {
+                        "description": "Observation",
+                        "short_description": "3C147 - run 01 - FR606LBA",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 3600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 1.494885776251229,
+                                            "angle2": 0.870081926555158,
+                                            "direction_type": "J2000",
+                                            "target": "3C147"
+                                        },
+                                        "name": "target",
+                                        "subbands": [
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 10,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 1.494885776251229,
+                                    "angle2": 0.870081926555158,
+                                    "direction_type": "J2000",
+                                    "target": "3C147"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "target observation",
+                            "version": 9
                         }
                     },
-                    "Ingest": {
-                        "description": "",
-                        "short_description": "",
-                        "specifications_doc": {},
+                    "Pipeline": {
+                        "description": "Preprocessing Pipeline for Observation",
+                        "short_description": "3C147 - run 01 - FR606LBA/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 122,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
                         "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 2,
-            "id": 26,
-            "state_value": "active",
-            "purpose_value": "production"
+            "version": 1,
+            "id": 37,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "IDOLS nighttime observation on single station CS021, ingest, cleanup",
-            "name": "IDOLS nighttime",
+            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+            "name": "IM HBA - 1 Beam",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 8
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -25642,53 +35168,103 @@
                         ]
                     },
                     {
-                        "name": "Duration",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/specifications_doc/duration"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Description",
+                        "name": "Target Pipeline Description",
                         "refs": [
-                            "#/tasks/BF 1 station LBA/short_description"
+                            "#/tasks/Target Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline 1 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Pointing ",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
-                    "scheduler": "fixed_time",
+                    "scheduler": "dynamic",
                     "sky": {
-                        "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
-                        },
-                        "min_elevation": {
-                            "calibrator": 0,
-                            "target": 0
-                        },
-                        "reference_pointing": {
-                            "enabled": false,
-                            "pointing": {
-                                "angle1": 0,
-                                "angle2": 0,
-                                "direction_type": "J2000",
-                                "target": "_target_name_"
-                            }
-                        },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -1440,
+                            "to": 1440
                         }
-                    },
-                    "time": {
-                        "at": "2030-01-01T00:00:00Z",
-                        "between": [],
-                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
@@ -25697,37 +35273,231 @@
                 },
                 "task_relations": [
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Calibrator Pipeline 1",
                         "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline 2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Target Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Ingest",
                         "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
                         "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "producer": "BF 1 station LBA",
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -25735,11 +35505,58 @@
                         }
                     }
                 ],
-                "task_scheduling_relations": [],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation 1",
+                        "placement": "before",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "Calibrator Observation 2",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
                 "tasks": {
-                    "BF 1 station LBA": {
-                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
-                        "short_description": "IDOLS_nighttime_LBA-YYYYMMDD",
+                    "Calibrator Observation 1": {
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cabc",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -25754,653 +35571,1365 @@
                                     "enabled": false
                                 }
                             },
-                            "beamformer": {
-                                "pipelines": [
-                                    {
-                                        "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP_Cal",
-                                                    "subbands": {
-                                                        "list": [
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
-                                                            96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
-                                                            104,
-                                                            105,
-                                                            106,
-                                                            107,
-                                                            108,
-                                                            109,
-                                                            110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
-                                                            117,
-                                                            118,
-                                                            119,
-                                                            120,
-                                                            121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
-                                                            126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
-                                                            131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
-                                                            136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
-                                                            141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
-                                                            146,
-                                                            147,
-                                                            148,
-                                                            149,
-                                                            150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
-                                                            156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
-                                                            161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
-                                                            172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
-                                                            178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
-                                                            183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
-                                                            189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
-                                                            194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
-                                                            201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
-                                                            206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
-                                                            211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
-                                                            216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
-                                                            221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
-                                                            232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
-                                                            237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
-                                                            244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
-                                                            249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
-                                                            255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
-                                                            263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
-                                                            269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
-                                                            274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
-                                                            279,
-                                                            280,
-                                                            281,
-                                                            282,
-                                                            283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
-                                                            295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
-                                                            300,
-                                                            301,
-                                                            302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
-                                                            312,
-                                                            313,
-                                                            314,
-                                                            315,
-                                                            316,
-                                                            317,
-                                                            318,
-                                                            319,
-                                                            320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
-                                                            328,
-                                                            329,
-                                                            330,
-                                                            331,
-                                                            332,
-                                                            333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
-                                                            338,
-                                                            339,
-                                                            340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
-                                                            347,
-                                                            348,
-                                                            349,
-                                                            350,
-                                                            351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
-                                                            356,
-                                                            357,
-                                                            358,
-                                                            359,
-                                                            360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
-                                                            366,
-                                                            367,
-                                                            368,
-                                                            369,
-                                                            370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
-                                                            376,
-                                                            377,
-                                                            378,
-                                                            379,
-                                                            380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
-                                                            385,
-                                                            386,
-                                                            387,
-                                                            388,
-                                                            389,
-                                                            390,
-                                                            391,
-                                                            392,
-                                                            393,
-                                                            394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
-                                                            400,
-                                                            401,
-                                                            402,
-                                                            403,
-                                                            404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450,
-                                                            451,
-                                                            452,
-                                                            453
-                                                        ],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "allow_after_previous": true,
-                                                            "duration": 0,
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "Calibrator"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 16,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "IQUV",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 128
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator2",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "Cal1 3Cabc/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "Cal2 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 28800,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "target1"
                                         },
-                                        "name": "CS_Sun",
-                                        "station_groups": [
-                                            {
-                                                "max_nr_missing": 0,
-                                                "stations": [
-                                                    "CS021"
-                                                ]
-                                            }
+                                        "name": "target",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
-                                "ppf": false
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 4,
+                                        "stations": [
+                                            "CS001",
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "target1"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "target observation",
+                            "version": 7
+                        }
+                    },
+                    "Target Pipeline": {
+                        "description": "Preprocessing Pipeline for Target Observation",
+                        "short_description": "_Target_Name_/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    }
+                }
+            },
+            "version": 32,
+            "id": 38,
+            "state_value": "legacy",
+            "purpose_value": "production"
+        },
+        {
+            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+            "name": "IM HBA - 1 Beam",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 8
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pipeline Description",
+                        "refs": [
+                            "#/tasks/Target Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline 1 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Pointing ",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pipeline 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_elevation": {
+                            "calibrator": 0.5235987756,
+                            "target": 0.5235987756
+                        },
+                        "transit_offset": {
+                            "from": -1440,
+                            "to": 1440
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Calibrator Pipeline 1",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Calibrator Pipeline 2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Target Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation 1",
+                        "placement": "before",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "Calibrator Observation 2",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation 1": {
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cabc",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
                             },
-                            "duration": 660,
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator2",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "Cal1 3Cabc/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "Cal2 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 28800,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 6.123487680622106,
-                                            "angle2": 1.026515399560465,
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "CasA"
+                                            "target": "target1"
                                         },
-                                        "name": "SAP_Cal",
+                                        "name": "target",
                                         "subbands": [
-                                            54,
-                                            80,
-                                            84,
-                                            88,
-                                            92,
-                                            96,
-                                            100,
                                             104,
+                                            105,
+                                            106,
+                                            107,
                                             108,
+                                            109,
+                                            110,
+                                            111,
                                             112,
+                                            113,
+                                            114,
+                                            115,
                                             116,
+                                            117,
+                                            118,
+                                            119,
                                             120,
+                                            121,
+                                            122,
+                                            123,
                                             124,
+                                            125,
+                                            126,
+                                            127,
                                             128,
+                                            129,
+                                            130,
+                                            131,
                                             132,
+                                            133,
+                                            134,
+                                            135,
                                             136,
+                                            138,
+                                            139,
                                             140,
+                                            141,
+                                            142,
+                                            143,
                                             144,
+                                            145,
+                                            146,
+                                            147,
                                             148,
+                                            149,
+                                            150,
+                                            151,
                                             152,
+                                            153,
+                                            154,
+                                            155,
                                             156,
+                                            157,
+                                            158,
+                                            159,
                                             160,
-                                            164,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
                                             168,
+                                            169,
+                                            170,
+                                            171,
                                             172,
+                                            173,
+                                            174,
+                                            175,
                                             176,
+                                            177,
+                                            178,
+                                            179,
                                             180,
+                                            182,
+                                            183,
                                             184,
+                                            187,
                                             188,
+                                            189,
+                                            190,
+                                            191,
                                             192,
+                                            193,
+                                            194,
+                                            195,
                                             196,
+                                            197,
+                                            198,
+                                            199,
                                             200,
+                                            201,
+                                            202,
+                                            203,
                                             204,
+                                            205,
+                                            206,
+                                            207,
                                             208,
+                                            209,
                                             212,
+                                            213,
+                                            215,
                                             216,
+                                            217,
+                                            218,
+                                            219,
                                             220,
+                                            221,
+                                            222,
+                                            223,
                                             224,
+                                            225,
+                                            226,
+                                            227,
                                             228,
+                                            229,
+                                            230,
+                                            231,
                                             232,
+                                            233,
+                                            234,
+                                            235,
                                             236,
+                                            237,
+                                            238,
+                                            239,
                                             240,
+                                            242,
+                                            243,
                                             244,
+                                            245,
+                                            246,
+                                            247,
                                             248,
+                                            249,
+                                            250,
+                                            251,
                                             252,
-                                            256,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
                                             260,
+                                            261,
+                                            262,
+                                            263,
                                             264,
+                                            265,
+                                            266,
+                                            267,
                                             268,
+                                            269,
+                                            270,
+                                            271,
                                             272,
+                                            273,
+                                            275,
                                             276,
+                                            277,
+                                            278,
+                                            279,
                                             280,
+                                            281,
+                                            282,
+                                            283,
                                             284,
+                                            285,
+                                            286,
+                                            287,
                                             288,
+                                            289,
+                                            290,
+                                            291,
                                             292,
+                                            293,
+                                            294,
+                                            295,
                                             296,
+                                            297,
+                                            298,
+                                            299,
                                             300,
+                                            302,
+                                            303,
                                             304,
+                                            305,
+                                            306,
+                                            307,
                                             308,
+                                            309,
+                                            310,
+                                            311,
                                             312,
+                                            313,
+                                            314,
+                                            315,
                                             316,
+                                            317,
+                                            318,
+                                            319,
                                             320,
+                                            321,
+                                            322,
+                                            323,
                                             324,
+                                            325,
+                                            326,
+                                            327,
                                             328,
+                                            330,
+                                            331,
                                             332,
+                                            333,
+                                            334,
+                                            335,
                                             336,
+                                            337,
+                                            338,
+                                            339,
                                             340,
+                                            341,
+                                            342,
+                                            343,
                                             344,
-                                            348,
-                                            352,
-                                            356,
-                                            360,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
                                             364,
-                                            368,
                                             372,
-                                            376,
                                             380,
-                                            384,
                                             388,
-                                            392,
-                                            394,
                                             396,
-                                            400,
                                             404,
-                                            408,
-                                            412
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_10_90",
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 0,
+                                        "max_nr_missing": 4,
                                         "stations": [
-                                            "CS021"
+                                            "CS001",
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0,
-                                    "angle2": 0,
-                                    "direction_type": "SUN",
-                                    "target": "Sun"
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "target1"
                                 }
                             }
                         },
                         "specifications_template": {
-                            "name": "beamforming observation",
+                            "name": "target observation",
                             "version": 8
                         }
                     },
-                    "Cleanup": {
-                        "description": "Cleaning up all output dataproducts for this scheduling unit",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "",
-                        "short_description": "",
-                        "specifications_doc": {},
+                    "Target Pipeline": {
+                        "description": "Preprocessing Pipeline for Target Observation",
+                        "short_description": "_Target_Name_/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
                         "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 3,
-            "id": 27,
-            "state_value": "active",
+            "version": 33,
+            "id": 39,
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a Rapid Response IM + BF observation (target-calibrator, two TABs recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
-            "name": "IM + BF 2 CV - 8 bit",
-            "purpose": "technical_commissioning",
+            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+            "name": "IM HBA - 1 Beam",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 8
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -26414,6 +36943,18 @@
                             "#/scheduling_constraints_doc"
                         ]
                     },
+                    {
+                        "name": "Observation Description",
+                        "refs": [
+                            "#/tasks/Target Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pipeline Description",
+                        "refs": [
+                            "#/tasks/Target Pipeline/short_description"
+                        ]
+                    },
                     {
                         "name": "Target Pointing",
                         "refs": [
@@ -26421,6 +36962,12 @@
                             "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
                     {
                         "name": "Target Duration",
                         "refs": [
@@ -26428,66 +36975,75 @@
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Calibrator Observation 1 Description",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline Description",
+                        "name": "Calibrator Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Pipeline target/short_description"
+                            "#/tasks/Calibrator Pipeline 1/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline Description",
+                        "name": "Calibrator Observation 1 Pointing ",
                         "refs": [
-                            "#/tasks/Pulsar Pipeline/short_description"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation Description",
+                        "name": "Calibrator Observation 1 Duration",
                         "refs": [
-                            "#/tasks/Calibrator Observation/short_description"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation Pointing",
+                        "name": "Calibrator Observation 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+                            "#/tasks/Calibrator Observation 2/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline Description",
+                        "name": "Calibrator Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/short_description"
+                            "#/tasks/Calibrator Pipeline 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Pointing",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
                         ]
                     },
                     {
                         "name": "Run Adder",
                         "refs": [
                             "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
                             "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
                     "scheduler": "dynamic",
                     "sky": {
-                        "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
-                        },
                         "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.5235987755982988
+                            "calibrator": 0.5235987756,
+                            "target": 0.5235987756
                         },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -1440,
+                            "to": 1440
                         }
                     }
                 },
@@ -26497,37 +37053,18 @@
                 },
                 "task_relations": [
                     {
-                        "consumer": "Pulsar Pipeline",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
+                        "consumer": "Calibrator Pipeline 1",
                         "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
-                        "producer": "Pulsar Pipeline",
+                        "producer": "Calibrator Observation 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26535,18 +37072,18 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Calibrator Pipeline 2",
                         "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
-                        "producer": "Pulsar Pipeline",
+                        "producer": "Calibrator Observation 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26554,56 +37091,41 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Target Pipeline",
                         "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
                         "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
                         "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
+                        "selection_doc": {
+                            "sap": [
+                                "target"
+                            ]
                         },
-                        "producer": "Pulsar Pipeline",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pulsar Pipeline",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26611,7 +37133,7 @@
                         }
                     },
                     {
-                        "consumer": "Calibrator Pipeline",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -26620,9 +37142,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Calibrator Observation",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26630,7 +37152,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -26639,21 +37161,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "SAP"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -26664,7 +37182,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Target Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26672,7 +37190,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -26681,9 +37199,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Target Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26702,7 +37220,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Calibrator Observation 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26721,7 +37239,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Calibrator Observation",
+                        "producer": "Calibrator Observation 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26740,7 +37258,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -26759,26 +37277,66 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
                             "version": 6
                         }
-                    }
-                ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    }
-                ],
-                "tasks": {
-                    "Calibrator Observation": {
-                        "description": "Calibrator Observation. After the Target Observation",
-                        "short_description": "Cal 3Cdef",
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation 1",
+                        "placement": "before",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "Calibrator Observation 2",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Calibrator Observation 1": {
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cabc",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -26795,7 +37353,7 @@
                             },
                             "calibrator": {
                                 "autoselect": false,
-                                "name": "calibrator1",
+                                "name": "calibrator2",
                                 "pointing": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
@@ -26803,30 +37361,21 @@
                                     "target": "3Cdef"
                                 }
                             },
-                            "duration": 600,
-                            "use_target_beamformer": false
+                            "duration": 600
                         },
                         "specifications_template": {
                             "name": "calibrator observation",
                             "version": 9
                         }
                     },
-                    "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "Cal 3Cdef/PP",
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "Cal1 3Cabc/PP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -26845,38 +37394,14 @@
                             "version": 8
                         }
                     },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "Pipeline target": {
-                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+01/TP",
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "Cal2 3Cdef/PP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -26895,62 +37420,20 @@
                             "version": 8
                         }
                     },
-                    "Pulsar Pipeline": {
-                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
-                        "short_description": "Baaaa+bb/PULP",
-                        "specifications_doc": {
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 20,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "dspsr": {
-                                "digifil": {
-                                    "channels_per_part": 20,
-                                    "coherent_dedispersion": false,
-                                    "dm": 0,
-                                    "integration_time_factor": 4
-                                },
-                                "enabled": false,
-                                "optimise_period_dm": false,
-                                "rfi_excision": true,
-                                "subintegration_length": -1
-                            },
-                            "output": {
-                                "dynamic_spectrum": {
-                                    "enabled": false,
-                                    "time_average": 0.5
-                                },
-                                "quantisation": {
-                                    "enabled": true,
-                                    "scale": 5
-                                }
-                            },
-                            "presto": {
-                                "fold_profile": true,
-                                "input": {
-                                    "decode_sigma": 3,
-                                    "nr_blocks": 100,
-                                    "samples_per_block": 8192
-                                },
-                                "prepfold": false,
-                                "rrats": {
-                                    "dm_range": 5,
-                                    "enabled": false
-                                }
-                            },
-                            "pulsar": {
-                                "name": "",
-                                "strategy": "meta"
-                            },
-                            "single_pulse_search": false
-                        },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
                         "specifications_template": {
-                            "name": "pulsar pipeline",
-                            "version": 9
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
                         }
                     },
                     "Target Observation": {
@@ -26970,127 +37453,12 @@
                                     "enabled": false
                                 }
                             },
-                            "beamformer": {
-                                "pipelines": [
-                                    {
-                                        "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP",
-                                                    "subbands": {
-                                                        "list": [],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OnTarget"
-                                                            },
-                                                            "relative": true
-                                                        },
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0.0002908882087,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OffTarget"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "XXYY",
-                                                "subbands_per_file": 20,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "name": "_beamformer_name_",
-                                        "station_groups": [
-                                            {
-                                                "max_nr_missing": 6,
-                                                "stations": [
-                                                    "CS002",
-                                                    "CS003",
-                                                    "CS004",
-                                                    "CS005",
-                                                    "CS006",
-                                                    "CS007",
-                                                    "CS011",
-                                                    "CS013",
-                                                    "CS017",
-                                                    "CS021",
-                                                    "CS024",
-                                                    "CS026",
-                                                    "CS028",
-                                                    "CS030",
-                                                    "CS031",
-                                                    "CS101",
-                                                    "CS103",
-                                                    "CS201",
-                                                    "CS301",
-                                                    "CS302",
-                                                    "CS401",
-                                                    "CS501"
-                                                ]
-                                            }
-                                        ]
-                                    }
-                                ],
-                                "ppf": false
-                            },
                             "correlator": {
                                 "channels_per_subband": 64,
                                 "integration_time": 1,
-                                "storage_cluster": "CEP4",
-                                "topocentric_frequency_correction": false
+                                "storage_cluster": "CEP4"
                             },
-                            "duration": 600,
+                            "duration": 28800,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -27098,9 +37466,9 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_name_"
+                                            "target": "target1"
                                         },
-                                        "name": "SAP",
+                                        "name": "target",
                                         "subbands": [
                                             104,
                                             105,
@@ -27135,7 +37503,6 @@
                                             134,
                                             135,
                                             136,
-                                            137,
                                             138,
                                             139,
                                             140,
@@ -27162,7 +37529,6 @@
                                             161,
                                             162,
                                             163,
-                                            164,
                                             165,
                                             166,
                                             167,
@@ -27179,12 +37545,9 @@
                                             178,
                                             179,
                                             180,
-                                            181,
                                             182,
                                             183,
                                             184,
-                                            185,
-                                            186,
                                             187,
                                             188,
                                             189,
@@ -27208,11 +37571,8 @@
                                             207,
                                             208,
                                             209,
-                                            210,
-                                            211,
                                             212,
                                             213,
-                                            214,
                                             215,
                                             216,
                                             217,
@@ -27239,7 +37599,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -27254,7 +37613,6 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
@@ -27272,7 +37630,6 @@
                                             271,
                                             272,
                                             273,
-                                            274,
                                             275,
                                             276,
                                             277,
@@ -27299,7 +37656,6 @@
                                             298,
                                             299,
                                             300,
-                                            301,
                                             302,
                                             303,
                                             304,
@@ -27327,7 +37683,6 @@
                                             326,
                                             327,
                                             328,
-                                            329,
                                             330,
                                             331,
                                             332,
@@ -27345,7 +37700,19 @@
                                             344,
                                             345,
                                             346,
-                                            347
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
@@ -27353,7 +37720,7 @@
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 6,
+                                        "max_nr_missing": 4,
                                         "stations": [
                                             "CS002",
                                             "CS003",
@@ -27370,6 +37737,7 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
+                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -27398,33 +37766,59 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "_target_name_"
+                                    "target": "target1"
                                 }
                             }
                         },
                         "specifications_template": {
-                            "name": "parallel target and beamforming observation",
-                            "version": 3
+                            "name": "target observation",
+                            "version": 8
+                        }
+                    },
+                    "Target Pipeline": {
+                        "description": "Preprocessing Pipeline for Target Observation",
+                        "short_description": "_Target_Name_/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 15,
-            "id": 28,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
+            "version": 34,
+            "id": 40,
+            "state_value": "legacy",
+            "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a Rapid Response IM + BF observation (target-calibrator, four TABs recording XXYY), Preprocessing pipeline, Pulsar pipeline (converting to 8 bit only), Cleanup",
-            "name": "IM + BF 4 CV - 8 bit",
-            "purpose": "technical_commissioning",
+            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+            "name": "IM HBA - 1 Beam",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 8
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -27439,138 +37833,106 @@
                         ]
                     },
                     {
-                        "name": "Target pointing",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Tile beam pointing",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
-                        ]
-                    },
-                    {
-                        "name": "Tied-array beam 0 pointing",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/0/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Tied-array beam 0 relation",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/0/relative"
-                        ]
-                    },
-                    {
-                        "name": "Tied-array beam 1 pointing",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/1/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Tied-array beam 1 relation",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/1/relative"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Tied-array beam 2 pointing",
+                        "name": "Target Pipeline Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/2/pointing"
+                            "#/tasks/Target Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Tied-array beam 2 relation",
+                        "name": "Target Pointing",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/2/relative"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Tied-array beam 3 pointing",
+                        "name": "Subbands",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/3/pointing"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
                         ]
                     },
                     {
-                        "name": "Tied-array beam 3 relation",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/beamformer/pipelines/0/coherent/SAPs/0/tabs/3/relative"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Calibrator Observation 1 Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Calibrator Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Calibrator Pipeline 1/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline Description",
+                        "name": "Calibrator Observation 1 Pointing ",
                         "refs": [
-                            "#/tasks/Pipeline target/short_description"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline Description",
+                        "name": "Calibrator Observation 1 Duration",
                         "refs": [
-                            "#/tasks/Pulsar Pipeline/short_description"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation Description",
+                        "name": "Calibrator Observation 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation/short_description"
+                            "#/tasks/Calibrator Observation 2/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation Pointing",
+                        "name": "Calibrator Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+                            "#/tasks/Calibrator Pipeline 2/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Duration",
+                        "name": "Calibrator Observation 2 Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation/specifications_doc/duration"
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline Description",
+                        "name": "Calibrator Observation 2 Duration",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/short_description"
+                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
                         ]
                     },
                     {
                         "name": "Run Adder",
                         "refs": [
                             "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
                             "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
                     "scheduler": "dynamic",
                     "sky": {
-                        "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
-                        },
                         "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.5235987755982988
+                            "calibrator": 0.5235987756,
+                            "target": 0.5235987756
                         },
                         "transit_offset": {
-                            "from": -21600,
-                            "to": 21600
+                            "from": -1440,
+                            "to": 1440
                         }
                     }
                 },
@@ -27580,37 +37942,18 @@
                 },
                 "task_relations": [
                     {
-                        "consumer": "Pulsar Pipeline",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
+                        "consumer": "Calibrator Pipeline 1",
                         "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
-                        "producer": "Pulsar Pipeline",
+                        "producer": "Calibrator Observation 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27618,37 +37961,18 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Calibrator Pipeline 2",
                         "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pulsar Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
                         "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Calibrator Observation 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27656,37 +37980,41 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Target Pipeline",
                         "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target"
+                            ]
                         },
-                        "producer": "Pulsar Pipeline",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pulsar Pipeline",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27694,7 +38022,7 @@
                         }
                     },
                     {
-                        "consumer": "Calibrator Pipeline",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -27703,9 +38031,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Calibrator Observation",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27713,7 +38041,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -27722,21 +38050,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "SAP"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -27747,7 +38071,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Target Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27755,7 +38079,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -27764,9 +38088,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Target Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27785,7 +38109,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Calibrator Observation 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27804,7 +38128,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Calibrator Observation",
+                        "producer": "Calibrator Observation 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27823,7 +38147,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27842,7 +38166,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -27852,16 +38176,22 @@
                 ],
                 "task_scheduling_relations": [
                     {
-                        "first": "Calibrator Observation",
+                        "first": "Calibrator Observation 1",
+                        "placement": "before",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "Calibrator Observation 2",
                         "placement": "after",
                         "second": "Target Observation",
                         "time_offset": 60
                     }
                 ],
                 "tasks": {
-                    "Calibrator Observation": {
-                        "description": "Calibrator Observation. After the Target Observation",
-                        "short_description": "Cal 3Cdef",
+                    "Calibrator Observation 1": {
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cabc",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -27880,36 +38210,61 @@
                                 "autoselect": false,
                                 "name": "calibrator1",
                                 "pointing": {
-                                    "angle1": 0.9293396170466985,
-                                    "angle2": 0.9525862980765968,
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 9
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator2",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
                                     "target": "3Cdef"
                                 }
                             },
-                            "duration": 600,
-                            "use_target_beamformer": false
+                            "duration": 600
                         },
                         "specifications_template": {
                             "name": "calibrator observation",
                             "version": 9
                         }
                     },
-                    "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "Cal 3Cdef/PP",
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "Cal1 3Cabc/PP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -27928,38 +38283,14 @@
                             "version": 8
                         }
                     },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "Pipeline target": {
-                        "description": "Preprocessing Pipeline for Target Observation target, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+01/TP",
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "Cal2 3Cdef/PP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -27978,62 +38309,20 @@
                             "version": 8
                         }
                     },
-                    "Pulsar Pipeline": {
-                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
-                        "short_description": "Baaaa+bb/PULP",
-                        "specifications_doc": {
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 20,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "dspsr": {
-                                "digifil": {
-                                    "channels_per_part": 20,
-                                    "coherent_dedispersion": false,
-                                    "dm": 0,
-                                    "integration_time_factor": 4
-                                },
-                                "enabled": false,
-                                "optimise_period_dm": false,
-                                "rfi_excision": true,
-                                "subintegration_length": -1
-                            },
-                            "output": {
-                                "dynamic_spectrum": {
-                                    "enabled": false,
-                                    "time_average": 0.5
-                                },
-                                "quantisation": {
-                                    "enabled": true,
-                                    "scale": 5
-                                }
-                            },
-                            "presto": {
-                                "fold_profile": true,
-                                "input": {
-                                    "decode_sigma": 3,
-                                    "nr_blocks": 100,
-                                    "samples_per_block": 8192
-                                },
-                                "prepfold": false,
-                                "rrats": {
-                                    "dm_range": 5,
-                                    "enabled": false
-                                }
-                            },
-                            "pulsar": {
-                                "name": "",
-                                "strategy": "meta"
-                            },
-                            "single_pulse_search": false
-                        },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
                         "specifications_template": {
-                            "name": "pulsar pipeline",
-                            "version": 6
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
                         }
                     },
                     "Target Observation": {
@@ -28053,156 +38342,22 @@
                                     "enabled": false
                                 }
                             },
-                            "beamformer": {
-                                "pipelines": [
-                                    {
-                                        "coherent": {
-                                            "SAPs": [
-                                                {
-                                                    "name": "SAP",
-                                                    "subbands": {
-                                                        "list": [],
-                                                        "method": "copy"
-                                                    },
-                                                    "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
-                                                    },
-                                                    "tabs": [
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OnTarget"
-                                                            },
-                                                            "relative": true
-                                                        },
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OffTarget"
-                                                            },
-                                                            "relative": true
-                                                        },
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OffTarget"
-                                                            },
-                                                            "relative": true
-                                                        },
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OffTarget"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "XXYY",
-                                                "subbands_per_file": 20,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "flys eye": {
-                                            "enabled": false,
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "incoherent": {
-                                            "SAPs": [],
-                                            "settings": {
-                                                "channels_per_subband": 1,
-                                                "quantisation": {
-                                                    "bits": 8,
-                                                    "enabled": false,
-                                                    "scale_max": 5,
-                                                    "scale_min": -5
-                                                },
-                                                "stokes": "I",
-                                                "subbands_per_file": 488,
-                                                "time_integration_factor": 1
-                                            }
-                                        },
-                                        "name": "_beamformer_name_",
-                                        "station_groups": [
-                                            {
-                                                "max_nr_missing": 6,
-                                                "stations": [
-                                                    "CS002",
-                                                    "CS003",
-                                                    "CS004",
-                                                    "CS005",
-                                                    "CS006",
-                                                    "CS007",
-                                                    "CS011",
-                                                    "CS013",
-                                                    "CS017",
-                                                    "CS021",
-                                                    "CS024",
-                                                    "CS026",
-                                                    "CS028",
-                                                    "CS030",
-                                                    "CS031",
-                                                    "CS032",
-                                                    "CS101",
-                                                    "CS103",
-                                                    "CS201",
-                                                    "CS301",
-                                                    "CS302",
-                                                    "CS401",
-                                                    "CS501"
-                                                ]
-                                            }
-                                        ]
-                                    }
-                                ],
-                                "ppf": false
-                            },
                             "correlator": {
                                 "channels_per_subband": 64,
                                 "integration_time": 1,
-                                "storage_cluster": "CEP4",
-                                "topocentric_frequency_correction": false
+                                "storage_cluster": "CEP4"
                             },
-                            "duration": 600,
+                            "duration": 28800,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.9293396170466985,
-                                            "angle2": 0.9525862980765968,
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_name_"
+                                            "target": "target1"
                                         },
-                                        "name": "SAP",
+                                        "name": "target",
                                         "subbands": [
                                             104,
                                             105,
@@ -28237,7 +38392,6 @@
                                             134,
                                             135,
                                             136,
-                                            137,
                                             138,
                                             139,
                                             140,
@@ -28264,7 +38418,6 @@
                                             161,
                                             162,
                                             163,
-                                            164,
                                             165,
                                             166,
                                             167,
@@ -28281,12 +38434,9 @@
                                             178,
                                             179,
                                             180,
-                                            181,
                                             182,
                                             183,
                                             184,
-                                            185,
-                                            186,
                                             187,
                                             188,
                                             189,
@@ -28310,11 +38460,8 @@
                                             207,
                                             208,
                                             209,
-                                            210,
-                                            211,
                                             212,
                                             213,
-                                            214,
                                             215,
                                             216,
                                             217,
@@ -28341,7 +38488,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -28356,7 +38502,6 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
@@ -28374,7 +38519,6 @@
                                             271,
                                             272,
                                             273,
-                                            274,
                                             275,
                                             276,
                                             277,
@@ -28401,7 +38545,6 @@
                                             298,
                                             299,
                                             300,
-                                            301,
                                             302,
                                             303,
                                             304,
@@ -28429,7 +38572,6 @@
                                             326,
                                             327,
                                             328,
-                                            329,
                                             330,
                                             331,
                                             332,
@@ -28447,7 +38589,19 @@
                                             344,
                                             345,
                                             346,
-                                            347
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
@@ -28455,7 +38609,7 @@
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 6,
+                                        "max_nr_missing": 4,
                                         "stations": [
                                             "CS002",
                                             "CS003",
@@ -28498,41 +38652,67 @@
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0.9293396170466985,
-                                    "angle2": 0.9525862980765968,
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "_target_name_"
+                                    "target": "target1"
                                 }
                             }
                         },
                         "specifications_template": {
-                            "name": "parallel target and beamforming observation",
-                            "version": 3
+                            "name": "target observation",
+                            "version": 9
+                        }
+                    },
+                    "Target Pipeline": {
+                        "description": "Preprocessing Pipeline for Target Observation",
+                        "short_description": "_Target_Name_/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 3,
-            "id": 29,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
+            "version": 35,
+            "id": 41,
+            "state_value": "legacy",
+            "purpose_value": "production"
         },
         {
-            "description": "Generic imaging observation with pipeline and ingest with 1 beam, no calibrator",
-            "name": "IM general - 1 beam",
-            "purpose": "technical_commissioning",
+            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+            "name": "IM HBA - 1 Beam",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
-            "state": "development",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -28544,116 +38724,114 @@
                     {
                         "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Observation/short_description"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline Description",
+                        "name": "Target Pipeline Description",
                         "refs": [
-                            "#/tasks/Pipeline/short_description"
+                            "#/tasks/Target Pipeline/short_description"
                         ]
                     },
                     {
                         "name": "Target Pointing",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
                         "name": "Subbands",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
                         ]
                     },
                     {
-                        "name": "Filter",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Antenna Set",
+                        "name": "Calibrator Observation 1 Description",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Calibrator Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/duration"
+                            "#/tasks/Calibrator Pipeline 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Pointing ",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 1 Duration",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/short_description"
                         ]
                     },
                     {
-                        "name": "Time averaging steps",
+                        "name": "Calibrator Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Pipeline/specifications_doc/average/time_steps"
+                            "#/tasks/Calibrator Pipeline 2/short_description"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps",
+                        "name": "Calibrator Observation 2 Pointing",
                         "refs": [
-                            "#/tasks/Pipeline/specifications_doc/average/frequency_steps"
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Flagging Strategy",
+                        "name": "Calibrator Observation 2 Duration",
                         "refs": [
-                            "#/tasks/Pipeline/specifications_doc/flag/rfi_strategy"
+                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
                         ]
                     },
                     {
                         "name": "Run Adder",
                         "refs": [
-                            "#/tasks/Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Observation/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
-                    "location": "center",
                     "scheduler": "dynamic",
                     "sky": {
-                        "min_distance": {
-                            "jupiter": 0.12217304763960307,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
-                        },
                         "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.6981317007977318
-                        },
-                        "reference_pointing": {
-                            "enabled": false,
-                            "pointing": {
-                                "angle1": 0,
-                                "angle2": 0,
-                                "direction_type": "J2000",
-                                "target": "_target_name_"
-                            }
+                            "calibrator": 0.5235987756,
+                            "target": 0.5235987756
                         },
                         "transit_offset": {
-                            "from": -7200,
-                            "to": 7200
+                            "from": -1440,
+                            "to": 1440
                         }
-                    },
-                    "time": {
-                        "between": [],
-                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Calibrator Pipeline 1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -28664,7 +38842,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Observation",
+                        "producer": "Calibrator Observation 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -28672,7 +38850,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline",
+                        "consumer": "Calibrator Pipeline 2",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -28683,7 +38861,26 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Observation",
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Target Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
                         "selection_doc": {
                             "sap": [
                                 "target"
@@ -28695,7 +38892,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -28706,7 +38903,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -28725,19 +38922,284 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 9
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Target Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
                     }
                 ],
-                "task_scheduling_relations": [],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation 1",
+                        "placement": "before",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "Calibrator Observation 2",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
                 "tasks": {
+                    "Calibrator Observation 1": {
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cabc",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 10
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator2",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 10
+                        }
+                    },
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "Cal1 3Cabc/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "Cal2 3Cdef/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
                     "Cleanup": {
-                        "description": "Clean up all dataproducts from disk",
-                        "short_description": "",
+                        "description": "Clean up all dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -28746,16 +39208,15 @@
                     },
                     "Ingest": {
                         "description": "Ingest all preprocessed dataproducts",
-                        "short_description": "",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "ingest",
                             "version": 7
                         }
                     },
-                    "Observation": {
-                        "description": "Observation",
-                        "short_description": "3C147 - run 01 - FR606LBA",
+                    "Target Observation": {
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -28773,23 +39234,79 @@
                             "correlator": {
                                 "channels_per_subband": 64,
                                 "integration_time": 1,
-                                "storage_cluster": "CEP4",
-                                "topocentric_frequency_correction": false
+                                "storage_cluster": "CEP4"
                             },
-                            "duration": 3600,
+                            "duration": 28800,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 1.494885776251229,
-                                            "angle2": 0.870081926555158,
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "3C147"
+                                            "target": "target1"
                                         },
                                         "name": "target",
                                         "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
                                             163,
-                                            164,
                                             165,
                                             166,
                                             167,
@@ -28806,12 +39323,9 @@
                                             178,
                                             179,
                                             180,
-                                            181,
                                             182,
                                             183,
                                             184,
-                                            185,
-                                            186,
                                             187,
                                             188,
                                             189,
@@ -28835,11 +39349,8 @@
                                             207,
                                             208,
                                             209,
-                                            210,
-                                            211,
                                             212,
                                             213,
-                                            214,
                                             215,
                                             216,
                                             217,
@@ -28866,7 +39377,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -28881,7 +39391,6 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
@@ -28899,7 +39408,6 @@
                                             271,
                                             272,
                                             273,
-                                            274,
                                             275,
                                             276,
                                             277,
@@ -28926,7 +39434,6 @@
                                             298,
                                             299,
                                             300,
-                                            301,
                                             302,
                                             303,
                                             304,
@@ -28954,7 +39461,6 @@
                                             326,
                                             327,
                                             328,
-                                            329,
                                             330,
                                             331,
                                             332,
@@ -28963,15 +39469,36 @@
                                             335,
                                             336,
                                             337,
-                                            338
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_10_90",
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 10,
+                                        "max_nr_missing": 4,
                                         "stations": [
                                             "CS002",
                                             "CS003",
@@ -29014,10 +39541,10 @@
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 1.494885776251229,
-                                    "angle2": 0.870081926555158,
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3C147"
+                                    "target": "target1"
                                 }
                             }
                         },
@@ -29026,22 +39553,14 @@
                             "version": 9
                         }
                     },
-                    "Pipeline": {
-                        "description": "Preprocessing Pipeline for Observation",
-                        "short_description": "3C147 - run 01 - FR606LBA/PP",
+                    "Target Pipeline": {
+                        "description": "Preprocessing Pipeline for Target Observation",
+                        "short_description": "_Target_Name_/PP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
+                                "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 122,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -29051,7 +39570,7 @@
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
+                                "rfi_strategy": "HBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -29062,22 +39581,22 @@
                     }
                 }
             },
-            "version": 1,
-            "id": 30,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
+            "version": 36,
+            "id": 42,
+            "state_value": "active",
+            "purpose_value": "production"
         },
-        {
-            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
-            "name": "IM HBA - 1 Beam",
-            "purpose": "production",
+        {
+            "description": "This observation strategy template defines a HBA observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. This has more free parameters than the LoTSS strategy.",
+            "name": "IM HBA - 2 Beams",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 7
             },
-            "state": "legacy",
+            "state": "development",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -29092,70 +39611,76 @@
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Target Pointing 1",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pipeline Description",
+                        "name": "Target Pointing 2",
                         "refs": [
-                            "#/tasks/Target Pipeline/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pointing",
+                        "name": "Tile Beam",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
                             "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Subband",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/subbands"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Description",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 1 Description",
+                        "name": "Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Pointing ",
+                        "name": "Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Duration",
+                        "name": "Calibrator Observation 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Description",
+                        "name": "Calibrator Observation 1 Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 2 Description",
+                        "name": "Calibrator Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 2/short_description"
+                            "#/tasks/Calibrator Pipeline 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Observation 2 Description",
+                        "refs": [
+                            "#/tasks/Calibrator Observation 2/short_description"
                         ]
                     },
                     {
@@ -29165,9 +39690,9 @@
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Duration",
+                        "name": "Calibrator Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+                            "#/tasks/Calibrator Pipeline 2/short_description"
                         ]
                     },
                     {
@@ -29185,6 +39710,15 @@
                 "scheduling_constraints_doc": {
                     "scheduler": "dynamic",
                     "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
                         "transit_offset": {
                             "from": -1440,
                             "to": 1440
@@ -29235,7 +39769,7 @@
                         }
                     },
                     {
-                        "consumer": "Target Pipeline",
+                        "consumer": "Pipeline target1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -29249,7 +39783,30 @@
                         "producer": "Target Observation",
                         "selection_doc": {
                             "sap": [
-                                "target"
+                                "sap1"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap2"
                             ]
                         },
                         "selection_template": {
@@ -29307,7 +39864,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Target Pipeline",
+                        "producer": "Pipeline target1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -29315,7 +39872,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -29326,7 +39883,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Target Pipeline",
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -29390,6 +39947,44 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -29497,7 +40092,7 @@
                             },
                             "calibrator": {
                                 "autoselect": false,
-                                "name": "calibrator2",
+                                "name": "calibrator1",
                                 "pointing": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
@@ -29520,6 +40115,14 @@
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -29546,6 +40149,14 @@
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -29580,9 +40191,77 @@
                             "version": 7
                         }
                     },
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+02/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
                     "Target Observation": {
-                        "description": "Target Observation",
-                        "short_description": "_Target_Name_",
+                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+                        "short_description": "Paaa+01 & Paaa+02",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -29610,9 +40289,263 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "target1"
+                                            "target": "Paaa+01"
                                         },
-                                        "name": "target",
+                                        "name": "sap1",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
+                                        },
+                                        "name": "sap2",
                                         "subbands": [
                                             104,
                                             105,
@@ -29905,13 +40838,39 @@
                                             "RS508",
                                             "RS509"
                                         ]
+                                    },
+                                    {
+                                        "max_nr_missing": 2,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "DE601",
+                                            "DE605"
+                                        ]
                                     }
                                 ],
                                 "tile_beam": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "target1"
+                                    "target": "Paaa+01Paaa+02REF"
                                 }
                             }
                         },
@@ -29919,49 +40878,23 @@
                             "name": "target observation",
                             "version": 7
                         }
-                    },
-                    "Target Pipeline": {
-                        "description": "Preprocessing Pipeline for Target Observation",
-                        "short_description": "_Target_Name_/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
                     }
                 }
             },
-            "version": 32,
-            "id": 31,
-            "state_value": "legacy",
-            "purpose_value": "production"
+            "version": 1,
+            "id": 43,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
-            "name": "IM HBA - 1 Beam",
-            "purpose": "production",
+            "description": "IM HBA 1 beam with CopyTask",
+            "name": "IM HBA 1 beam - CopyTask",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
                 "version": 8
             },
-            "state": "legacy",
+            "state": "development",
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
@@ -29983,12 +40916,6 @@
                             "#/tasks/Target Observation/short_description"
                         ]
                     },
-                    {
-                        "name": "Target Pipeline Description",
-                        "refs": [
-                            "#/tasks/Target Pipeline/short_description"
-                        ]
-                    },
                     {
                         "name": "Target Pointing",
                         "refs": [
@@ -30008,77 +40935,43 @@
                             "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
-                    {
-                        "name": "Calibrator Observation 1 Description",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Pipeline 1 Description",
-                        "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation 1 Pointing ",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation 1 Duration",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation 2 Description",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Pipeline 2 Description",
-                        "refs": [
-                            "#/tasks/Calibrator Pipeline 2/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation 2 Pointing",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation 2 Duration",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
-                        ]
-                    },
                     {
                         "name": "Run Adder",
                         "refs": [
                             "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "location": "center",
                     "scheduler": "dynamic",
                     "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0,
+                            "sun": 0
+                        },
                         "min_elevation": {
-                            "calibrator": 0.5235987756,
-                            "target": 0.5235987756
+                            "calibrator": 0.05235987755982988,
+                            "target": 0.05235987755982988
+                        },
+                        "reference_pointing": {
+                            "enabled": false
                         },
                         "transit_offset": {
-                            "from": -1440,
-                            "to": 1440
+                            "from": -43200,
+                            "to": 43200
                         }
+                    },
+                    "time": {
+                        "between": [],
+                        "not_between": []
                     }
                 },
                 "scheduling_constraints_template": {
@@ -30087,144 +40980,7 @@
                 },
                 "task_relations": [
                     {
-                        "consumer": "Calibrator Pipeline 1",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Calibrator Pipeline 2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Target Pipeline",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Target Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Target Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
+                        "consumer": "CopyTask",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -30241,233 +40997,21 @@
                             "name": "all",
                             "version": 6
                         }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation 1",
-                        "placement": "before",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    },
-                    {
-                        "first": "Calibrator Observation 2",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
                     }
                 ],
+                "task_scheduling_relations": [],
                 "tasks": {
-                    "Calibrator Observation 1": {
-                        "description": "Calibrator Observation 1. Before the Target Observation",
-                        "short_description": "Cal1 3Cabc",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cabc"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 9
-                        }
-                    },
-                    "Calibrator Observation 2": {
-                        "description": "Calibrator Observation 2. After the Target Observation",
-                        "short_description": "Cal2 3Cdef",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator2",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 9
-                        }
-                    },
-                    "Calibrator Pipeline 1": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
-                        "short_description": "Cal1 3Cabc/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Pipeline 2": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
-                        "short_description": "Cal2 3Cdef/PP",
+                    "CopyTask": {
+                        "description": "Copy the observation output to lexar",
+                        "short_description": "copy",
                         "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
+                            "destination": "lexar003:/localhome/lofarsys/copytasktest",
+                            "group_by_id": true,
+                            "managed_output": false
                         },
                         "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
+                            "name": "copy pipeline",
+                            "version": 1
                         }
                     },
                     "Target Observation": {
@@ -30490,14 +41034,15 @@
                             "correlator": {
                                 "channels_per_subband": 64,
                                 "integration_time": 1,
-                                "storage_cluster": "CEP4"
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
                             },
-                            "duration": 28800,
+                            "duration": 60,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
+                                            "angle1": 3.280425596160204,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
                                             "target": "target1"
@@ -30750,55 +41295,18 @@
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
+                                "antenna_set": "HBA_ZERO",
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 4,
+                                        "max_nr_missing": 0,
                                         "stations": [
-                                            "CS001",
-                                            "CS002",
-                                            "CS003",
-                                            "CS004",
-                                            "CS005",
-                                            "CS006",
-                                            "CS007",
-                                            "CS011",
-                                            "CS013",
-                                            "CS017",
-                                            "CS021",
-                                            "CS024",
-                                            "CS026",
-                                            "CS028",
-                                            "CS030",
-                                            "CS031",
-                                            "CS032",
-                                            "CS101",
-                                            "CS103",
-                                            "CS201",
-                                            "CS301",
-                                            "CS302",
-                                            "CS401",
-                                            "CS501",
-                                            "RS106",
-                                            "RS205",
-                                            "RS208",
-                                            "RS210",
-                                            "RS305",
-                                            "RS306",
-                                            "RS307",
-                                            "RS310",
-                                            "RS406",
-                                            "RS407",
-                                            "RS409",
-                                            "RS503",
-                                            "RS508",
-                                            "RS509"
+                                            "CS001"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0.6624317181687094,
+                                    "angle1": 3.280425596160204,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
                                     "target": "target1"
@@ -30807,53 +41315,27 @@
                         },
                         "specifications_template": {
                             "name": "target observation",
-                            "version": 8
-                        }
-                    },
-                    "Target Pipeline": {
-                        "description": "Preprocessing Pipeline for Target Observation",
-                        "short_description": "_Target_Name_/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
+                            "version": 9
                         }
                     }
                 }
             },
-            "version": 33,
-            "id": 32,
-            "state_value": "legacy",
-            "purpose_value": "production"
+            "version": 1,
+            "id": 44,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
-            "name": "IM HBA - 1 Beam",
-            "purpose": "production",
+            "description": "This observation strategy template defines a LoTSS deep field run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only, using a central beam with 3 flanking fields.",
+            "name": "IM HBA Deep - 4 Beams",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 5
             },
-            "state": "legacy",
+            "state": "development",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -30861,6 +41343,12 @@
                             "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
+                    {
+                        "name": "Target Duration",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
+                    },
                     {
                         "name": "Scheduling Constraints",
                         "refs": [
@@ -30868,62 +41356,80 @@
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Target Observation Description",
                         "refs": [
                             "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Target Pipeline Description",
+                        "name": "Pipeline Central Target Description",
                         "refs": [
-                            "#/tasks/Target Pipeline/short_description"
+                            "#/tasks/Pipeline Central Target/short_description"
                         ]
                     },
                     {
-                        "name": "Target Pointing",
+                        "name": "Pipeline Offset A Description",
+                        "refs": [
+                            "#/tasks/Pipeline Offset A/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Offset B Description",
+                        "refs": [
+                            "#/tasks/Pipeline Offset B/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Offset C Description",
+                        "refs": [
+                            "#/tasks/Pipeline Offset C/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Central Pointing",
                         "refs": [
                             "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
                             "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Pointing Offset A",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Pointing Offset B",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Description",
+                        "name": "Pointing Offset C",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 1 Description",
+                        "name": "Calibrator 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Pointing ",
+                        "name": "Calibrator Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Calibrator Pipeline 1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Duration",
+                        "name": "Calibrator 1 Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Description",
+                        "name": "Calibrator 2 Description",
                         "refs": [
                             "#/tasks/Calibrator Observation 2/short_description"
                         ]
@@ -30935,36 +41441,22 @@
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Pointing",
+                        "name": "Calibrator 2 Pointing",
                         "refs": [
                             "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Duration",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Run Adder",
+                        "name": "Run ADDER QA",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
                             "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
                     "scheduler": "dynamic",
                     "sky": {
-                        "min_elevation": {
-                            "calibrator": 0.5235987756,
-                            "target": 0.5235987756
-                        },
                         "transit_offset": {
                             "from": -1440,
                             "to": 1440
@@ -30992,7 +41484,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
@@ -31011,11 +41503,11 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Target Pipeline",
+                        "consumer": "Pipeline Central Target",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31029,16 +41521,16 @@
                         "producer": "Target Observation",
                         "selection_doc": {
                             "sap": [
-                                "target"
+                                "central-sap"
                             ]
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Pipeline Offset A",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31047,17 +41539,21 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "offset-A"
+                            ]
                         },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
-                            "version": 6
+                            "name": "SAP",
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Pipeline Offset B",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31066,17 +41562,21 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "offset-B"
+                            ]
                         },
-                        "producer": "Calibrator Pipeline 2",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
-                            "version": 6
+                            "name": "SAP",
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Pipeline Offset C",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31085,17 +41585,21 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "offset-C"
+                            ]
                         },
-                        "producer": "Target Pipeline",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
-                            "version": 6
+                            "name": "SAP",
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31106,15 +41610,15 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Target Pipeline",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31123,17 +41627,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31142,17 +41646,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Calibrator Observation 1",
+                        "producer": "Pipeline Central Target",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31161,17 +41665,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Calibrator Observation 2",
+                        "producer": "Pipeline Offset A",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31182,15 +41686,15 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 1",
+                        "producer": "Pipeline Offset B",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31201,11 +41705,11 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 2",
+                        "producer": "Pipeline Offset C",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     }
                 ],
@@ -31225,83 +41729,144 @@
                 ],
                 "tasks": {
                     "Calibrator Observation 1": {
-                        "description": "Calibrator Observation 1. Before the Target Observation",
-                        "short_description": "Cal1 3Cabc",
+                        "description": "Calibrator Observation for UC1 HBA scheduling unit",
+                        "short_description": "3Cabc",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cab1"
                                 }
                             },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Observation 2": {
+                        "description": "Calibrator Observation for UC1 HBA scheduling unit",
+                        "short_description": "3Cabc",
+                        "specifications_doc": {
                             "calibrator": {
                                 "autoselect": false,
-                                "name": "calibrator1",
+                                "name": "calibrator2",
                                 "pointing": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3Cabc"
+                                    "target": "3Cab2"
                                 }
                             },
                             "duration": 600
                         },
                         "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 9
+                            "name": "calibrator observation",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 1": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+                        "short_description": "3Cabc/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Calibrator Pipeline 2": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+                        "short_description": "3Cabc/PP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "short_description": "Ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
                         }
                     },
-                    "Calibrator Observation 2": {
-                        "description": "Calibrator Observation 2. After the Target Observation",
-                        "short_description": "Cal2 3Cdef",
+                    "Pipeline Central Target": {
+                        "description": "Preprocessing Pipeline for Central Target, SAP000",
+                        "short_description": "_target_field_name_/1.0/TP",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 2
                             },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator2",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
+                            "demix": {
+                                "frequency_steps": 16,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
                             },
-                            "duration": 600
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
                         },
                         "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 9
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     },
-                    "Calibrator Pipeline 1": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
-                        "short_description": "Cal1 3Cabc/PP",
+                    "Pipeline Offset A": {
+                        "description": "Preprocessing Pipeline for Offset Target A, SAP001",
+                        "short_description": "_target_field_name_-IS-A/1.1/TP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
-                                "time_steps": 1
+                                "time_steps": 2
                             },
                             "demix": {
-                                "frequency_steps": 64,
+                                "frequency_steps": 16,
                                 "ignore_target": false,
                                 "sources": [],
                                 "time_steps": 10
@@ -31318,16 +41883,16 @@
                             "version": 8
                         }
                     },
-                    "Calibrator Pipeline 2": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
-                        "short_description": "Cal2 3Cdef/PP",
+                    "Pipeline Offset B": {
+                        "description": "Preprocessing Pipeline for Offset Target B, SAP002",
+                        "short_description": "_target_field_name_-IS-B/1.2/TP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
-                                "time_steps": 1
+                                "time_steps": 2
                             },
                             "demix": {
-                                "frequency_steps": 64,
+                                "frequency_steps": 16,
                                 "ignore_target": false,
                                 "sources": [],
                                 "time_steps": 10
@@ -31344,29 +41909,39 @@
                             "version": 8
                         }
                     },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
+                    "Pipeline Offset C": {
+                        "description": "Preprocessing Pipeline for Offset Target C, SAP003",
+                        "short_description": "_target_field_name_-IS-C/1.3/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 16,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
                         "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     },
                     "Target Observation": {
-                        "description": "Target Observation",
-                        "short_description": "_Target_Name_",
+                        "description": "Target Observation for Deep HBA observation with 3 flanking fields",
+                        "short_description": "_target_name_ Run _nr_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": false,
+                                    "enabled": true,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -31374,7 +41949,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": false
+                                    "enabled": true
                                 }
                             },
                             "correlator": {
@@ -31382,7 +41957,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 28800,
+                            "duration": 120,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -31390,10 +41965,37 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "target1"
+                                            "target": "_target_field_name_"
                                         },
-                                        "name": "target",
+                                        "name": "central-sap",
                                         "subbands": [
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
                                             104,
                                             105,
                                             106,
@@ -31427,6 +42029,7 @@
                                             134,
                                             135,
                                             136,
+                                            137,
                                             138,
                                             139,
                                             140,
@@ -31453,6 +42056,7 @@
                                             161,
                                             162,
                                             163,
+                                            164,
                                             165,
                                             166,
                                             167,
@@ -31469,9 +42073,12 @@
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -31495,8 +42102,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -31523,6 +42133,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -31537,6 +42148,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -31554,6 +42166,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -31580,6 +42193,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -31607,6 +42221,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -31625,18 +42240,256 @@
                                             345,
                                             346,
                                             347,
+                                            348,
                                             349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
                                             364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
                                             372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
                                             380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
                                             388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
                                             396,
-                                            404,
+                                            402,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
                                             413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
                                             421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
                                             430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
                                             438,
-                                            447
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453,
+                                            454,
+                                            455,
+                                            456
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_field_name_-IS-A"
+                                        },
+                                        "name": "offset-A",
+                                        "subbands": [
+                                            77,
+                                            87,
+                                            97,
+                                            107,
+                                            117,
+                                            127,
+                                            137,
+                                            147,
+                                            157,
+                                            167,
+                                            177,
+                                            187,
+                                            197,
+                                            207,
+                                            217,
+                                            227,
+                                            237,
+                                            247,
+                                            257,
+                                            267,
+                                            277,
+                                            287,
+                                            297,
+                                            307,
+                                            317,
+                                            327,
+                                            337,
+                                            347,
+                                            357,
+                                            367,
+                                            377,
+                                            387,
+                                            396,
+                                            407,
+                                            417,
+                                            427,
+                                            437,
+                                            447,
+                                            456
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_field_name_-IS-B"
+                                        },
+                                        "name": "offset-B",
+                                        "subbands": [
+                                            77,
+                                            87,
+                                            97,
+                                            107,
+                                            117,
+                                            127,
+                                            137,
+                                            147,
+                                            157,
+                                            167,
+                                            177,
+                                            187,
+                                            197,
+                                            207,
+                                            217,
+                                            227,
+                                            237,
+                                            247,
+                                            257,
+                                            267,
+                                            277,
+                                            287,
+                                            297,
+                                            307,
+                                            317,
+                                            327,
+                                            337,
+                                            347,
+                                            357,
+                                            367,
+                                            377,
+                                            387,
+                                            396,
+                                            407,
+                                            417,
+                                            427,
+                                            437,
+                                            447,
+                                            456
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_field_name_-IS-C"
+                                        },
+                                        "name": "offset-C",
+                                        "subbands": [
+                                            77,
+                                            87,
+                                            97,
+                                            107,
+                                            117,
+                                            127,
+                                            137,
+                                            147,
+                                            157,
+                                            167,
+                                            177,
+                                            187,
+                                            197,
+                                            207,
+                                            217,
+                                            227,
+                                            237,
+                                            247,
+                                            257,
+                                            267,
+                                            277,
+                                            287,
+                                            297,
+                                            307,
+                                            317,
+                                            327,
+                                            337,
+                                            347,
+                                            357,
+                                            367,
+                                            377,
+                                            387,
+                                            396,
+                                            407,
+                                            417,
+                                            427,
+                                            437,
+                                            447,
+                                            456
                                         ]
                                     }
                                 ],
@@ -31646,6 +42499,7 @@
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
+                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -31684,63 +42538,63 @@
                                             "RS508",
                                             "RS509"
                                         ]
+                                    },
+                                    {
+                                        "max_nr_missing": 2,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "DE601",
+                                            "DE605"
+                                        ]
                                     }
                                 ],
                                 "tile_beam": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "target1"
+                                    "target": "Tile Beam on Central Target"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "target observation",
-                            "version": 8
-                        }
-                    },
-                    "Target Pipeline": {
-                        "description": "Preprocessing Pipeline for Target Observation",
-                        "short_description": "_Target_Name_/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
+                            "version": 4
                         }
                     }
                 }
             },
-            "version": 34,
-            "id": 33,
-            "state_value": "legacy",
-            "purpose_value": "production"
+            "version": 10,
+            "id": 45,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "This observation strategy template defines a single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
-            "name": "IM HBA - 1 Beam",
+            "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
+            "name": "IM HBA LoTSS - 2 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
                 "version": 8
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
@@ -31757,70 +42611,69 @@
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Target Pointing 1",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pipeline Description",
+                        "name": "Target Pointing 2",
                         "refs": [
-                            "#/tasks/Target Pipeline/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pointing",
+                        "name": "Tile Beam",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
                             "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Description",
+                        "name": "Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 1 Description",
+                        "name": "Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Pointing ",
+                        "name": "Calibrator Observation 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Duration",
+                        "name": "Calibrator Observation 1 Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Description",
+                        "name": "Calibrator Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
+                            "#/tasks/Calibrator Pipeline 1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 2 Description",
+                        "name": "Calibrator Observation 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 2/short_description"
+                            "#/tasks/Calibrator Observation 2/short_description"
                         ]
                     },
                     {
@@ -31830,9 +42683,9 @@
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Duration",
+                        "name": "Calibrator Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+                            "#/tasks/Calibrator Pipeline 2/short_description"
                         ]
                     },
                     {
@@ -31850,9 +42703,14 @@
                 "scheduling_constraints_doc": {
                     "scheduler": "dynamic",
                     "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
                         "min_elevation": {
-                            "calibrator": 0.5235987756,
-                            "target": 0.5235987756
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
                         },
                         "transit_offset": {
                             "from": -1440,
@@ -31904,7 +42762,7 @@
                         }
                     },
                     {
-                        "consumer": "Target Pipeline",
+                        "consumer": "Pipeline target1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31918,7 +42776,30 @@
                         "producer": "Target Observation",
                         "selection_doc": {
                             "sap": [
-                                "target"
+                                "sap1"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap2"
                             ]
                         },
                         "selection_template": {
@@ -31976,7 +42857,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Target Pipeline",
+                        "producer": "Pipeline target1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -31984,7 +42865,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -31995,7 +42876,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Target Pipeline",
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -32059,6 +42940,44 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -32144,7 +43063,7 @@
                         },
                         "specifications_template": {
                             "name": "calibrator observation",
-                            "version": 9
+                            "version": 8
                         }
                     },
                     "Calibrator Observation 2": {
@@ -32166,7 +43085,7 @@
                             },
                             "calibrator": {
                                 "autoselect": false,
-                                "name": "calibrator2",
+                                "name": "calibrator1",
                                 "pointing": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
@@ -32178,7 +43097,7 @@
                         },
                         "specifications_template": {
                             "name": "calibrator observation",
-                            "version": 9
+                            "version": 8
                         }
                     },
                     "Calibrator Pipeline 1": {
@@ -32189,6 +43108,14 @@
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -32215,6 +43142,14 @@
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -32249,9 +43184,77 @@
                             "version": 7
                         }
                     },
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+02/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
                     "Target Observation": {
-                        "description": "Target Observation",
-                        "short_description": "_Target_Name_",
+                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+                        "short_description": "Paaa+01 & Paaa+02",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -32279,9 +43282,263 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "target1"
+                                            "target": "Paaa+01"
                                         },
-                                        "name": "target",
+                                        "name": "sap1",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
+                                        },
+                                        "name": "sap2",
                                         "subbands": [
                                             104,
                                             105,
@@ -32535,6 +43792,7 @@
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
+                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -32573,65 +43831,65 @@
                                             "RS508",
                                             "RS509"
                                         ]
+                                    },
+                                    {
+                                        "max_nr_missing": 2,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "DE601",
+                                            "DE605"
+                                        ]
                                     }
                                 ],
                                 "tile_beam": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "target1"
+                                    "target": "Paaa+01Paaa+02REF"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "target observation",
-                            "version": 9
-                        }
-                    },
-                    "Target Pipeline": {
-                        "description": "Preprocessing Pipeline for Target Observation",
-                        "short_description": "_Target_Name_/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
+                            "version": 7
                         }
                     }
                 }
             },
-            "version": 35,
-            "id": 34,
-            "state_value": "active",
+            "version": 13,
+            "id": 46,
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a HBA observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. This has more free parameters than the LoTSS strategy.",
-            "name": "IM HBA - 2 Beams",
-            "purpose": "technical_commissioning",
+            "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
+            "name": "IM HBA LoTSS - 2 Beams",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 8
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -32669,13 +43927,6 @@
                             "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
-                    {
-                        "name": "Subband",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands",
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/subbands"
-                        ]
-                    },
                     {
                         "name": "Observation Description",
                         "refs": [
@@ -33828,549 +45079,110 @@
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
-                                "filter": "HBA_110_190",
-                                "station_groups": [
-                                    {
-                                        "max_nr_missing": 4,
-                                        "stations": [
-                                            "CS001",
-                                            "CS002",
-                                            "CS003",
-                                            "CS004",
-                                            "CS005",
-                                            "CS006",
-                                            "CS007",
-                                            "CS011",
-                                            "CS013",
-                                            "CS017",
-                                            "CS021",
-                                            "CS024",
-                                            "CS026",
-                                            "CS028",
-                                            "CS030",
-                                            "CS031",
-                                            "CS032",
-                                            "CS101",
-                                            "CS103",
-                                            "CS201",
-                                            "CS301",
-                                            "CS302",
-                                            "CS401",
-                                            "CS501",
-                                            "RS106",
-                                            "RS205",
-                                            "RS208",
-                                            "RS210",
-                                            "RS305",
-                                            "RS306",
-                                            "RS307",
-                                            "RS310",
-                                            "RS406",
-                                            "RS407",
-                                            "RS409",
-                                            "RS503",
-                                            "RS508",
-                                            "RS509"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 2,
-                                        "stations": [
-                                            "DE601",
-                                            "DE602",
-                                            "DE603",
-                                            "DE604",
-                                            "DE605",
-                                            "DE609",
-                                            "FR606",
-                                            "SE607",
-                                            "UK608",
-                                            "PL610",
-                                            "PL611",
-                                            "PL612",
-                                            "IE613",
-                                            "LV614"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 1,
-                                        "stations": [
-                                            "DE601",
-                                            "DE605"
-                                        ]
-                                    }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "Paaa+01Paaa+02REF"
-                                }
-                            }
-                        },
-                        "specifications_template": {
-                            "name": "target observation",
-                            "version": 7
-                        }
-                    }
-                }
-            },
-            "version": 1,
-            "id": 35,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
-        },
-        {
-            "description": "IM HBA 1 beam with CopyTask",
-            "name": "IM HBA 1 beam - CopyTask",
-            "purpose": "technical_commissioning",
-            "scheduling_unit_template": {
-                "name": "scheduling unit",
-                "version": 8
-            },
-            "state": "development",
-            "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
-                "parameters": [
-                    {
-                        "name": "Stations",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
-                        ]
-                    },
-                    {
-                        "name": "Scheduling Constraints",
-                        "refs": [
-                            "#/scheduling_constraints_doc"
-                        ]
-                    },
-                    {
-                        "name": "Observation Description",
-                        "refs": [
-                            "#/tasks/Target Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
-                        ]
-                    },
-                    {
-                        "name": "Subbands",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
-                        ]
-                    },
-                    {
-                        "name": "Target Duration",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Run Adder",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled"
-                        ]
-                    }
-                ],
-                "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
-                    "location": "center",
-                    "scheduler": "dynamic",
-                    "sky": {
-                        "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
-                        },
-                        "min_elevation": {
-                            "calibrator": 0.05235987755982988,
-                            "target": 0.05235987755982988
-                        },
-                        "reference_pointing": {
-                            "enabled": false
-                        },
-                        "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
-                        }
-                    },
-                    "time": {
-                        "between": [],
-                        "not_between": []
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
-                    {
-                        "consumer": "CopyTask",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [],
-                "tasks": {
-                    "CopyTask": {
-                        "description": "Copy the observation output to lexar",
-                        "short_description": "copy",
-                        "specifications_doc": {
-                            "destination": "lexar003:/localhome/lofarsys/copytasktest",
-                            "group_by_id": true,
-                            "managed_output": false
-                        },
-                        "specifications_template": {
-                            "name": "copy pipeline",
-                            "version": 1
-                        }
-                    },
-                    "Target Observation": {
-                        "description": "Target Observation",
-                        "short_description": "_Target_Name_",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4",
-                                "topocentric_frequency_correction": false
-                            },
-                            "duration": 60,
-                            "station_configuration": {
-                                "SAPs": [
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 3.280425596160204,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "target1"
-                                        },
-                                        "name": "target",
-                                        "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            182,
-                                            183,
-                                            184,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            212,
-                                            213,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
-                                        ]
-                                    }
-                                ],
-                                "antenna_set": "HBA_ZERO",
+                                "antenna_set": "HBA_DUAL_INNER",
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 0,
+                                        "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001"
+                                            "CS001",
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 2,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "DE601",
+                                            "DE605"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 3.280425596160204,
+                                    "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "target1"
+                                    "target": "Paaa+01Paaa+02REF"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "target observation",
-                            "version": 9
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 1,
-            "id": 36,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
+            "version": 14,
+            "id": 47,
+            "state_value": "legacy",
+            "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a LoTSS deep field run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only, using a central beam with 3 flanking fields.",
-            "name": "IM HBA Deep - 4 Beams",
-            "purpose": "technical_commissioning",
+            "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
+            "name": "IM HBA LoTSS - 2 Beams",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 7
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -34378,12 +45190,6 @@
                             "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
-                    {
-                        "name": "Target Duration",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
-                        ]
-                    },
                     {
                         "name": "Scheduling Constraints",
                         "refs": [
@@ -34391,64 +45197,57 @@
                         ]
                     },
                     {
-                        "name": "Target Observation Description",
-                        "refs": [
-                            "#/tasks/Target Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline Central Target Description",
+                        "name": "Target Pointing 1",
                         "refs": [
-                            "#/tasks/Pipeline Central Target/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline Offset A Description",
+                        "name": "Target Pointing 2",
                         "refs": [
-                            "#/tasks/Pipeline Offset A/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline Offset B Description",
+                        "name": "Tile Beam",
                         "refs": [
-                            "#/tasks/Pipeline Offset B/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Pipeline Offset C Description",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Pipeline Offset C/short_description"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Central Pointing",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Pointing Offset A",
+                        "name": "Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Pointing Offset B",
+                        "name": "Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Pointing Offset C",
+                        "name": "Calibrator Observation 1 Description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
+                            "#/tasks/Calibrator Observation 1/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator 1 Description",
+                        "name": "Calibrator Observation 1 Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
@@ -34458,15 +45257,15 @@
                         ]
                     },
                     {
-                        "name": "Calibrator 1 Pointing",
+                        "name": "Calibrator Observation 2 Description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Calibrator Observation 2/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator 2 Description",
+                        "name": "Calibrator Observation 2 Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
+                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
@@ -34476,22 +45275,29 @@
                         ]
                     },
                     {
-                        "name": "Calibrator 2 Pointing",
-                        "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Run ADDER QA",
+                        "name": "Run Adder",
                         "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
                             "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled"
+                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
                     "scheduler": "dynamic",
                     "sky": {
+                        "min_distance": {
+                            "jupiter": 0.26179938779,
+                            "moon": 0.5235987755982988,
+                            "sun": 0.5235987755982988
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
+                        },
                         "transit_offset": {
                             "from": -1440,
                             "to": 1440
@@ -34519,7 +45325,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -34538,11 +45344,11 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline Central Target",
+                        "consumer": "Pipeline target1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34556,16 +45362,16 @@
                         "producer": "Target Observation",
                         "selection_doc": {
                             "sap": [
-                                "central-sap"
+                                "sap1"
                             ]
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline Offset A",
+                        "consumer": "Pipeline target2",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34579,16 +45385,16 @@
                         "producer": "Target Observation",
                         "selection_doc": {
                             "sap": [
-                                "offset-A"
+                                "sap2"
                             ]
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline Offset B",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34597,21 +45403,74 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "offset-B"
-                            ]
+                        "producer": "Calibrator Pipeline 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline 2",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
-                            "version": 4
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline Offset C",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34623,18 +45482,14 @@
                             "role": "correlator"
                         },
                         "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "offset-C"
-                            ]
-                        },
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
-                            "version": 4
+                            "name": "all",
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34643,17 +45498,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Calibrator Pipeline 1",
+                        "producer": "Calibrator Observation 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34662,17 +45517,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Calibrator Pipeline 2",
+                        "producer": "Calibrator Observation 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34683,15 +45538,15 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline Central Target",
+                        "producer": "Pipeline target1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34702,15 +45557,15 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline Offset A",
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34721,15 +45576,15 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline Offset B",
+                        "producer": "Calibrator Pipeline 1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -34740,11 +45595,11 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline Offset C",
+                        "producer": "Calibrator Pipeline 2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     }
                 ],
@@ -34764,9 +45619,22 @@
                 ],
                 "tasks": {
                     "Calibrator Observation 1": {
-                        "description": "Calibrator Observation for UC1 HBA scheduling unit",
-                        "short_description": "3Cabc",
+                        "description": "Calibrator Observation 1. Before the Target Observation",
+                        "short_description": "Cal1 3Cabc",
                         "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
                             "calibrator": {
                                 "autoselect": false,
                                 "name": "calibrator1",
@@ -34774,7 +45642,7 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3Cab1"
+                                    "target": "3Cabc"
                                 }
                             },
                             "duration": 600
@@ -34785,17 +45653,30 @@
                         }
                     },
                     "Calibrator Observation 2": {
-                        "description": "Calibrator Observation for UC1 HBA scheduling unit",
-                        "short_description": "3Cabc",
+                        "description": "Calibrator Observation 2. After the Target Observation",
+                        "short_description": "Cal2 3Cdef",
                         "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
                             "calibrator": {
                                 "autoselect": false,
-                                "name": "calibrator2",
+                                "name": "calibrator1",
                                 "pointing": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3Cab2"
+                                    "target": "3Cdef"
                                 }
                             },
                             "duration": 600
@@ -34807,12 +45688,20 @@
                     },
                     "Calibrator Pipeline 1": {
                         "description": "Preprocessing Pipeline for Calibrator Observation 1",
-                        "short_description": "3Cabc/PP",
+                        "short_description": "Cal1 3Cabc/PP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -34833,12 +45722,20 @@
                     },
                     "Calibrator Pipeline 2": {
                         "description": "Preprocessing Pipeline for Calibrator Observation 2",
-                        "short_description": "3Cabc/PP",
+                        "short_description": "Cal2 3Cdef/PP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -34857,51 +45754,40 @@
                             "version": 8
                         }
                     },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
                     "Ingest": {
                         "description": "Ingest all preprocessed dataproducts",
-                        "short_description": "Ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "ingest",
                             "version": 7
                         }
                     },
-                    "Pipeline Central Target": {
-                        "description": "Preprocessing Pipeline for Central Target, SAP000",
-                        "short_description": "_target_field_name_/1.0/TP",
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
-                                "time_steps": 2
-                            },
-                            "demix": {
-                                "frequency_steps": 16,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
+                                "time_steps": 1
                             },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline Offset A": {
-                        "description": "Preprocessing Pipeline for Offset Target A, SAP001",
-                        "short_description": "_target_field_name_-IS-A/1.1/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 2
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
-                                "frequency_steps": 16,
+                                "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
                                 "time_steps": 10
@@ -34918,42 +45804,24 @@
                             "version": 8
                         }
                     },
-                    "Pipeline Offset B": {
-                        "description": "Preprocessing Pipeline for Offset Target B, SAP002",
-                        "short_description": "_target_field_name_-IS-B/1.2/TP",
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+02/TP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
-                                "time_steps": 2
-                            },
-                            "demix": {
-                                "frequency_steps": 16,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
+                                "time_steps": 1
                             },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline Offset C": {
-                        "description": "Preprocessing Pipeline for Offset Target C, SAP003",
-                        "short_description": "_target_field_name_-IS-C/1.3/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 2
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
-                                "frequency_steps": 16,
+                                "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
                                 "time_steps": 10
@@ -34971,12 +45839,12 @@
                         }
                     },
                     "Target Observation": {
-                        "description": "Target Observation for Deep HBA observation with 3 flanking fields",
-                        "short_description": "_target_name_ Run _nr_",
+                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+                        "short_description": "Paaa+01 & Paaa+02",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -34984,7 +45852,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": true
+                                    "enabled": false
                                 }
                             },
                             "correlator": {
@@ -34992,7 +45860,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 120,
+                            "duration": 28800,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -35000,37 +45868,264 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_field_name_"
+                                            "target": "Paaa+01"
                                         },
-                                        "name": "central-sap",
+                                        "name": "sap1",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
+                                        },
+                                        "name": "sap2",
                                         "subbands": [
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
                                             104,
                                             105,
                                             106,
@@ -35064,7 +46159,6 @@
                                             134,
                                             135,
                                             136,
-                                            137,
                                             138,
                                             139,
                                             140,
@@ -35091,7 +46185,6 @@
                                             161,
                                             162,
                                             163,
-                                            164,
                                             165,
                                             166,
                                             167,
@@ -35108,12 +46201,9 @@
                                             178,
                                             179,
                                             180,
-                                            181,
                                             182,
                                             183,
                                             184,
-                                            185,
-                                            186,
                                             187,
                                             188,
                                             189,
@@ -35137,11 +46227,8 @@
                                             207,
                                             208,
                                             209,
-                                            210,
-                                            211,
                                             212,
                                             213,
-                                            214,
                                             215,
                                             216,
                                             217,
@@ -35168,7 +46255,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -35183,7 +46269,6 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
@@ -35201,7 +46286,6 @@
                                             271,
                                             272,
                                             273,
-                                            274,
                                             275,
                                             276,
                                             277,
@@ -35228,7 +46312,6 @@
                                             298,
                                             299,
                                             300,
-                                            301,
                                             302,
                                             303,
                                             304,
@@ -35256,7 +46339,6 @@
                                             326,
                                             327,
                                             328,
-                                            329,
                                             330,
                                             331,
                                             332,
@@ -35275,256 +46357,18 @@
                                             345,
                                             346,
                                             347,
-                                            348,
                                             349,
-                                            350,
-                                            351,
-                                            352,
-                                            353,
-                                            354,
-                                            355,
-                                            356,
-                                            357,
-                                            358,
-                                            359,
-                                            360,
-                                            361,
-                                            362,
-                                            363,
                                             364,
-                                            365,
-                                            366,
-                                            367,
-                                            368,
-                                            369,
-                                            370,
-                                            371,
                                             372,
-                                            373,
-                                            374,
-                                            375,
-                                            376,
-                                            377,
-                                            378,
-                                            379,
                                             380,
-                                            381,
-                                            382,
-                                            383,
-                                            384,
-                                            385,
-                                            386,
-                                            387,
                                             388,
-                                            389,
-                                            390,
-                                            391,
-                                            392,
-                                            393,
-                                            394,
-                                            395,
                                             396,
-                                            402,
-                                            407,
-                                            408,
-                                            409,
-                                            410,
-                                            411,
-                                            412,
+                                            404,
                                             413,
-                                            414,
-                                            415,
-                                            416,
-                                            417,
-                                            418,
-                                            419,
-                                            420,
                                             421,
-                                            422,
-                                            423,
-                                            424,
-                                            425,
-                                            426,
-                                            427,
-                                            428,
-                                            429,
                                             430,
-                                            431,
-                                            432,
-                                            433,
-                                            434,
-                                            435,
-                                            436,
-                                            437,
                                             438,
-                                            439,
-                                            440,
-                                            441,
-                                            442,
-                                            443,
-                                            444,
-                                            445,
-                                            446,
-                                            447,
-                                            448,
-                                            449,
-                                            450,
-                                            451,
-                                            452,
-                                            453,
-                                            454,
-                                            455,
-                                            456
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "_target_field_name_-IS-A"
-                                        },
-                                        "name": "offset-A",
-                                        "subbands": [
-                                            77,
-                                            87,
-                                            97,
-                                            107,
-                                            117,
-                                            127,
-                                            137,
-                                            147,
-                                            157,
-                                            167,
-                                            177,
-                                            187,
-                                            197,
-                                            207,
-                                            217,
-                                            227,
-                                            237,
-                                            247,
-                                            257,
-                                            267,
-                                            277,
-                                            287,
-                                            297,
-                                            307,
-                                            317,
-                                            327,
-                                            337,
-                                            347,
-                                            357,
-                                            367,
-                                            377,
-                                            387,
-                                            396,
-                                            407,
-                                            417,
-                                            427,
-                                            437,
-                                            447,
-                                            456
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "_target_field_name_-IS-B"
-                                        },
-                                        "name": "offset-B",
-                                        "subbands": [
-                                            77,
-                                            87,
-                                            97,
-                                            107,
-                                            117,
-                                            127,
-                                            137,
-                                            147,
-                                            157,
-                                            167,
-                                            177,
-                                            187,
-                                            197,
-                                            207,
-                                            217,
-                                            227,
-                                            237,
-                                            247,
-                                            257,
-                                            267,
-                                            277,
-                                            287,
-                                            297,
-                                            307,
-                                            317,
-                                            327,
-                                            337,
-                                            347,
-                                            357,
-                                            367,
-                                            377,
-                                            387,
-                                            396,
-                                            407,
-                                            417,
-                                            427,
-                                            437,
-                                            447,
-                                            456
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "_target_field_name_-IS-C"
-                                        },
-                                        "name": "offset-C",
-                                        "subbands": [
-                                            77,
-                                            87,
-                                            97,
-                                            107,
-                                            117,
-                                            127,
-                                            137,
-                                            147,
-                                            157,
-                                            167,
-                                            177,
-                                            187,
-                                            197,
-                                            207,
-                                            217,
-                                            227,
-                                            237,
-                                            247,
-                                            257,
-                                            267,
-                                            277,
-                                            287,
-                                            297,
-                                            307,
-                                            317,
-                                            327,
-                                            337,
-                                            347,
-                                            357,
-                                            367,
-                                            377,
-                                            387,
-                                            396,
-                                            407,
-                                            417,
-                                            427,
-                                            437,
-                                            447,
-                                            456
+                                            447
                                         ]
                                     }
                                 ],
@@ -35534,7 +46378,6 @@
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -35605,21 +46448,21 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "Tile Beam on Central Target"
+                                    "target": "Paaa+01Paaa+02REF"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "target observation",
-                            "version": 4
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 10,
-            "id": 37,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
+            "version": 15,
+            "id": 48,
+            "state_value": "legacy",
+            "purpose_value": "production"
         },
         {
             "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
@@ -35627,11 +46470,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
-            "state": "legacy",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -35739,9 +46582,11 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
+                            "target": {
+                                "jupiter": 0.26179938779,
+                                "moon": 0.5235987755982988,
+                                "sun": 0.5235987755982988
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0.5235987755982988,
@@ -35755,7 +46600,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -36317,9 +47162,263 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+01"
+                                            "target": "Paaa+01"
+                                        },
+                                        "name": "sap1",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
                                         },
-                                        "name": "sap1",
+                                        "name": "sap2",
                                         "subbands": [
                                             104,
                                             105,
@@ -36565,22 +47664,462 @@
                                             438,
                                             447
                                         ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 4,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS210",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS310",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503",
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 2,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
                                     },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "DE601",
+                                            "DE605"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "Paaa+01Paaa+02REF"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "target observation",
+                            "version": 9
+                        }
+                    }
+                }
+            },
+            "version": 16,
+            "id": 49,
+            "state_value": "active",
+            "purpose_value": "production"
+        },
+        {
+            "description": "LBA Imaging Observing Strategy using 1 Beam and a parallel Calibrator Beam with a preprocessing pipeline for each.",
+            "name": "IM LBA - 1 Beam",
+            "purpose": "production",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 8
+            },
+            "state": "legacy",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Run ADDER QA",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+                        ]
+                    },
+                    {
+                        "name": "Observation description",
+                        "refs": [
+                            "#/tasks/Combined Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline description",
+                        "refs": [
+                            "#/tasks/Pipeline target/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Calibrator description",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                        ]
+                    },
+                    {
+                        "name": "Calibrator Pointing",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Time averaging steps",
+                        "refs": [
+                            "#/tasks/Pipeline target/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
+                        ]
+                    },
+                    {
+                        "name": "Frequency averaging steps",
+                        "refs": [
+                            "#/tasks/Pipeline target/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+                        ]
+                    },
+                    {
+                        "name": "Demix Pipeline Target",
+                        "refs": [
+                            "#/tasks/Pipeline target/specifications_doc/demix"
+                        ]
+                    },
+                    {
+                        "name": "Demix Pipeline Calibrator",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0.52359877559,
+                            "moon": 0.52359877559,
+                            "sun": 0.52359877559
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.52359877559,
+                            "target": 0.69813170079
+                        },
+                        "transit_offset": {
+                            "from": -7200,
+                            "to": 7200
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "calibrator"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target1"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "oOOO.O 3Cabc",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Combined Observation": {
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 1 target beam",
+                        "short_description": "OOO.O _Target_name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": true,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": true
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
                                     {
                                         "digital_pointing": {
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+02"
+                                            "target": "_Target_name_"
                                         },
-                                        "name": "sap2",
+                                        "name": "target1",
                                         "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
                                             110,
                                             111,
                                             112,
@@ -36608,6 +48147,7 @@
                                             134,
                                             135,
                                             136,
+                                            137,
                                             138,
                                             139,
                                             140,
@@ -36634,6 +48174,7 @@
                                             161,
                                             162,
                                             163,
+                                            164,
                                             165,
                                             166,
                                             167,
@@ -36650,9 +48191,12 @@
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -36676,8 +48220,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -36704,6 +48251,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -36718,6 +48266,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -36735,6 +48284,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -36761,6 +48311,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -36788,6 +48339,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -36806,28 +48358,21 @@
                                             345,
                                             346,
                                             347,
+                                            348,
                                             349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
+                                            350,
+                                            351,
+                                            352,
+                                            353
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
-                                "filter": "HBA_110_190",
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -36867,6 +48412,20 @@
                                             "RS509"
                                         ]
                                     },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "RS310",
+                                            "RS210"
+                                        ]
+                                    },
                                     {
                                         "max_nr_missing": 2,
                                         "stations": [
@@ -36893,30 +48452,58 @@
                                             "DE605"
                                         ]
                                     }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "Paaa+01Paaa+02REF"
-                                }
+                                ]
                             }
                         },
                         "specifications_template": {
-                            "name": "target observation",
+                            "name": "parallel calibrator target observation",
+                            "version": 9
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
                             "version": 7
                         }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target beam",
+                        "short_description": "oOOO.O _Target_name_",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
                     }
                 }
             },
-            "version": 13,
-            "id": 38,
+            "version": 11,
+            "id": 50,
             "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
-            "name": "IM HBA LoTSS - 2 Beams",
+            "description": "LBA Imaging Observing Strategy using 1 Beam and a parallel Calibrator Beam with a preprocessing pipeline for each.",
+            "name": "IM LBA - 1 Beam",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
@@ -36929,7 +48516,7 @@
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -36939,110 +48526,113 @@
                         ]
                     },
                     {
-                        "name": "Target Pointing 1",
+                        "name": "Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                            "#/tasks/Combined Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Pointing 2",
+                        "name": "Subbands",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands"
                         ]
                     },
                     {
-                        "name": "Tile Beam",
+                        "name": "Filter",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Antenna Set",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Run ADDER QA",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 Description",
+                        "name": "Observation description",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Combined Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 Description",
+                        "name": "Pipeline description",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Pipeline target/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Description",
+                        "name": "Pipeline Calibrator description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Calibrator Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Pointing",
+                        "name": "Target Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 1 Description",
+                        "name": "Calibrator Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Description",
+                        "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
+                            "#/tasks/Pipeline target/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Pointing",
+                        "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 2 Description",
+                        "name": "Demix Pipeline Target",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 2/short_description"
+                            "#/tasks/Pipeline target/specifications_doc/demix"
                         ]
                     },
                     {
-                        "name": "Run Adder",
+                        "name": "Demix Pipeline Calibrator",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
+                            "jupiter": 0.52359877559,
+                            "moon": 0.52359877559,
+                            "sun": 0.52359877559
                         },
                         "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.5235987755982988
+                            "calibrator": 0.52359877559,
+                            "target": 0.69813170079
                         },
                         "transit_offset": {
-                            "from": -1440,
-                            "to": 1440
+                            "from": -7200,
+                            "to": 7200
                         }
                     }
                 },
@@ -37052,45 +48642,7 @@
                 },
                 "task_relations": [
                     {
-                        "consumer": "Calibrator Pipeline 1",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Calibrator Pipeline 2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target1",
+                        "consumer": "Calibrator Pipeline",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -37101,10 +48653,10 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "sap1"
+                                "calibrator"
                             ]
                         },
                         "selection_template": {
@@ -37113,7 +48665,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target2",
+                        "consumer": "Pipeline target",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -37124,10 +48676,10 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "sap2"
+                                "target1"
                             ]
                         },
                         "selection_template": {
@@ -37147,45 +48699,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -37204,290 +48718,91 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
+                        "producer": "Pipeline target",
                         "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation 1",
-                        "placement": "before",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    },
-                    {
-                        "first": "Calibrator Observation 2",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    }
-                ],
-                "tasks": {
-                    "Calibrator Observation 1": {
-                        "description": "Calibrator Observation 1. Before the Target Observation",
-                        "short_description": "Cal1 3Cabc",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cabc"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Observation 2": {
-                        "description": "Calibrator Observation 2. After the Target Observation",
-                        "short_description": "Cal2 3Cdef",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
-                            },
-                            "duration": 600
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
                     },
-                    "Calibrator Pipeline 1": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
-                        "short_description": "Cal1 3Cabc/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
                     },
-                    "Calibrator Pipeline 2": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
-                        "short_description": "Cal2 3Cdef/PP",
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "oOOO.O 3Cabc",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "time_steps": 2
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
+                                "rfi_strategy": "LBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -37504,89 +48819,13 @@
                             "version": 7
                         }
                     },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+01/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+02/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Target Observation": {
-                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
-                        "short_description": "Paaa+01 & Paaa+02",
+                    "Combined Observation": {
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 1 target beam",
+                        "short_description": "OOO.O _Target_name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": false,
+                                    "enabled": true,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -37594,7 +48833,17 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": false
+                                    "enabled": true
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
                                 }
                             },
                             "correlator": {
@@ -37602,7 +48851,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 28800,
+                            "duration": 120,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -37610,270 +48859,10 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "sap1",
-                                        "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            182,
-                                            183,
-                                            184,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            212,
-                                            213,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+02"
+                                            "target": "_Target_name_"
                                         },
-                                        "name": "sap2",
+                                        "name": "target1",
                                         "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
                                             110,
                                             111,
                                             112,
@@ -37901,6 +48890,7 @@
                                             134,
                                             135,
                                             136,
+                                            137,
                                             138,
                                             139,
                                             140,
@@ -37927,6 +48917,7 @@
                                             161,
                                             162,
                                             163,
+                                            164,
                                             165,
                                             166,
                                             167,
@@ -37943,9 +48934,12 @@
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -37969,8 +48963,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -37997,6 +48994,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -38011,6 +49009,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -38028,6 +49027,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -38054,6 +49054,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -38081,6 +49082,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -38099,28 +49101,21 @@
                                             345,
                                             346,
                                             347,
+                                            348,
                                             349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
+                                            350,
+                                            351,
+                                            352,
+                                            353
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
-                                "filter": "HBA_110_190",
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -38160,6 +49155,20 @@
                                             "RS509"
                                         ]
                                     },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "RS310",
+                                            "RS210"
+                                        ]
+                                    },
                                     {
                                         "max_nr_missing": 2,
                                         "stations": [
@@ -38186,43 +49195,71 @@
                                             "DE605"
                                         ]
                                     }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "Paaa+01Paaa+02REF"
-                                }
+                                ]
                             }
                         },
                         "specifications_template": {
-                            "name": "target observation",
+                            "name": "parallel calibrator target observation",
+                            "version": 10
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target beam",
+                        "short_description": "oOOO.O _Target_name_",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
                             "version": 8
                         }
                     }
                 }
             },
-            "version": 14,
-            "id": 39,
+            "version": 12,
+            "id": 51,
             "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
-            "name": "IM HBA LoTSS - 2 Beams",
+            "description": "LBA Imaging Observing Strategy using 1 Beam and a parallel Calibrator Beam with a preprocessing pipeline for each.",
+            "name": "IM LBA - 1 Beam",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
-            "state": "legacy",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -38232,158 +49269,125 @@
                         ]
                     },
                     {
-                        "name": "Target Pointing 1",
+                        "name": "Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                            "#/tasks/Combined Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Pointing 2",
+                        "name": "Subbands",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands"
                         ]
                     },
                     {
-                        "name": "Tile Beam",
+                        "name": "Filter",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Antenna Set",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Run ADDER QA",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 Description",
+                        "name": "Observation description",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Combined Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 Description",
+                        "name": "Pipeline description",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Pipeline target/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Description",
+                        "name": "Pipeline Calibrator description",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Calibrator Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Pointing",
+                        "name": "Target Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 1 Description",
+                        "name": "Calibrator Pointing",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Description",
+                        "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
+                            "#/tasks/Pipeline target/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Pointing",
+                        "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 2 Description",
+                        "name": "Demix Pipeline Target",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 2/short_description"
+                            "#/tasks/Pipeline target/specifications_doc/demix"
                         ]
                     },
                     {
-                        "name": "Run Adder",
+                        "name": "Demix Pipeline Calibrator",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
+                            "target": {
+                                "jupiter": 0.52359877559,
+                                "moon": 0.52359877559,
+                                "sun": 0.52359877559
+                            }
                         },
                         "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.5235987755982988
+                            "calibrator": 0.52359877559,
+                            "target": 0.69813170079
                         },
                         "transit_offset": {
-                            "from": -1440,
-                            "to": 1440
+                            "from": -7200,
+                            "to": 7200
                         }
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
-                        "consumer": "Calibrator Pipeline 1",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Calibrator Pipeline 2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target1",
+                        "consumer": "Calibrator Pipeline",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -38394,10 +49398,10 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "sap1"
+                                "calibrator"
                             ]
                         },
                         "selection_template": {
@@ -38406,7 +49410,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target2",
+                        "consumer": "Pipeline target",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -38417,10 +49421,10 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "sap2"
+                                "target1"
                             ]
                         },
                         "selection_template": {
@@ -38440,45 +49444,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -38497,45 +49463,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
+                        "producer": "Pipeline target",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -38554,64 +49482,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 1",
+                        "producer": "Combined Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -38630,207 +49501,53 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation 1",
-                        "placement": "before",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    },
-                    {
-                        "first": "Calibrator Observation 2",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    }
-                ],
-                "tasks": {
-                    "Calibrator Observation 1": {
-                        "description": "Calibrator Observation 1. Before the Target Observation",
-                        "short_description": "Cal1 3Cabc",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cabc"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Observation 2": {
-                        "description": "Calibrator Observation 2. After the Target Observation",
-                        "short_description": "Cal2 3Cdef",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Pipeline 1": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
-                        "short_description": "Cal1 3Cabc/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Pipeline 2": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
-                        "short_description": "Cal2 3Cdef/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
+                        "producer": "Pipeline target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
                     },
-                    "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+01/TP",
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "oOOO.O 3Cabc",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "time_steps": 2
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
+                                "rfi_strategy": "LBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -38839,47 +49556,21 @@
                             "version": 8
                         }
                     },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+02/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
                         "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
+                            "name": "cleanup",
+                            "version": 7
                         }
                     },
-                    "Target Observation": {
-                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
-                        "short_description": "Paaa+01 & Paaa+02",
+                    "Combined Observation": {
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 1 target beam",
+                        "short_description": "OOO.O _Target_name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": false,
+                                    "enabled": true,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -38887,7 +49578,17 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": false
+                                    "enabled": true
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
                                 }
                             },
                             "correlator": {
@@ -38895,7 +49596,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 28800,
+                            "duration": 120,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -38903,270 +49604,10 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "sap1",
-                                        "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            182,
-                                            183,
-                                            184,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            212,
-                                            213,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+02"
+                                            "target": "_Target_name_"
                                         },
-                                        "name": "sap2",
+                                        "name": "target1",
                                         "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
                                             110,
                                             111,
                                             112,
@@ -39194,6 +49635,7 @@
                                             134,
                                             135,
                                             136,
+                                            137,
                                             138,
                                             139,
                                             140,
@@ -39220,6 +49662,7 @@
                                             161,
                                             162,
                                             163,
+                                            164,
                                             165,
                                             166,
                                             167,
@@ -39236,9 +49679,12 @@
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -39262,8 +49708,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -39290,6 +49739,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -39304,6 +49754,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -39321,6 +49772,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -39347,6 +49799,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -39374,6 +49827,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -39392,23 +49846,17 @@
                                             345,
                                             346,
                                             347,
+                                            348,
                                             349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
+                                            350,
+                                            351,
+                                            352,
+                                            353
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
-                                "filter": "HBA_110_190",
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -39452,6 +49900,20 @@
                                             "RS509"
                                         ]
                                     },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "RS508",
+                                            "RS509"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "RS310",
+                                            "RS210"
+                                        ]
+                                    },
                                     {
                                         "max_nr_missing": 2,
                                         "stations": [
@@ -39478,30 +49940,58 @@
                                             "DE605"
                                         ]
                                     }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "Paaa+01Paaa+02REF"
-                                }
+                                ]
                             }
                         },
                         "specifications_template": {
-                            "name": "target observation",
+                            "name": "parallel calibrator target observation",
+                            "version": 11
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target": {
+                        "description": "Preprocessing Pipeline for Target Observation target beam",
+                        "short_description": "oOOO.O _Target_name_",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
                             "version": 8
                         }
                     }
                 }
             },
-            "version": 15,
-            "id": 40,
-            "state_value": "legacy",
+            "version": 13,
+            "id": 52,
+            "state_value": "active",
             "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Added cleanup.",
-            "name": "IM HBA LoTSS - 2 Beams",
+            "description": "LBA Imaging Observing Strategy using 2 Target Beams and a parallel Calibrator Beam with a preprocessing pipeline for each.",
+            "name": "IM LBA - 2 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
@@ -39514,7 +50004,7 @@
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -39524,110 +50014,150 @@
                         ]
                     },
                     {
-                        "name": "Target Pointing 1",
+                        "name": "Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                            "#/tasks/Combined Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Pointing 2",
+                        "name": "Antenna Set",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
                         ]
                     },
                     {
-                        "name": "Tile Beam",
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Run ADDER QA",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+                        ]
+                    },
+                    {
+                        "name": "Observation description",
+                        "refs": [
+                            "#/tasks/Combined Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline 1 description",
+                        "refs": [
+                            "#/tasks/Pipeline target1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline 2 description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Pipeline Calibrator description",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Calibrator Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Target Pointing 1",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 Description",
+                        "name": "Target Pointing 2",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 Description",
+                        "name": "Calibrator Pointing",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Description",
+                        "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/short_description"
+                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 1 Pointing",
+                        "name": "Time averaging steps demix",
                         "refs": [
-                            "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 1 Description",
+                        "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 1/short_description"
+                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Description",
+                        "name": "Frequency averaging steps demix",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/short_description"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Calibrator Observation 2 Pointing",
+                        "name": "Demix sources Pipeline Target 1",
                         "refs": [
-                            "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
                         ]
                     },
                     {
-                        "name": "Calibrator Pipeline 2 Description",
+                        "name": "Demix sources Pipeline Target 2",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline 2/short_description"
+                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
                         ]
                     },
                     {
-                        "name": "Run Adder",
+                        "name": "Demix sources Pipeline Calibrator",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 1/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation 2/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
                             "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
+                            "moon": 0.52359877559,
+                            "sun": 0.52359877559
                         },
                         "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.5235987755982988
+                            "calibrator": 0.52359877559,
+                            "target": 0.87266462599
                         },
                         "transit_offset": {
-                            "from": -1440,
-                            "to": 1440
+                            "from": -43200,
+                            "to": 43200
                         }
                     }
                 },
@@ -39637,7 +50167,7 @@
                 },
                 "task_relations": [
                     {
-                        "consumer": "Calibrator Pipeline 1",
+                        "consumer": "Calibrator Pipeline",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -39648,29 +50178,14 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Calibrator Pipeline 2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "calibrator"
+                            ]
                         },
-                        "producer": "Calibrator Observation 2",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
@@ -39686,10 +50201,10 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "sap1"
+                                "target1"
                             ]
                         },
                         "selection_template": {
@@ -39709,10 +50224,10 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
+                        "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "sap2"
+                                "target2"
                             ]
                         },
                         "selection_template": {
@@ -39732,26 +50247,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -39808,45 +50304,7 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation 2",
+                        "producer": "Combined Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -39903,26 +50361,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline 1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline 2",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -39930,149 +50369,26 @@
                         }
                     }
                 ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation 1",
-                        "placement": "before",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    },
-                    {
-                        "first": "Calibrator Observation 2",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    }
-                ],
+                "task_scheduling_relations": [],
                 "tasks": {
-                    "Calibrator Observation 1": {
-                        "description": "Calibrator Observation 1. Before the Target Observation",
-                        "short_description": "Cal1 3Cabc",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cabc"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Observation 2": {
-                        "description": "Calibrator Observation 2. After the Target Observation",
-                        "short_description": "Cal2 3Cdef",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator1",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Pipeline 1": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 1",
-                        "short_description": "Cal1 3Cabc/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Pipeline 2": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation 2",
-                        "short_description": "Cal2 3Cdef/PP",
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "3Cabc/1.0/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 16,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
+                                "rfi_strategy": "LBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -40082,96 +50398,20 @@
                         }
                     },
                     "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
+                        "description": "Clean up all output dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
                             "version": 7
                         }
                     },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+01/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+02/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Target Observation": {
-                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
-                        "short_description": "Paaa+01 & Paaa+02",
+                    "Combined Observation": {
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
+                        "short_description": "_observation_name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": false,
+                                    "enabled": true,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -40179,104 +50419,46 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": false
+                                    "enabled": true
                                 }
                             },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4"
-                            },
-                            "duration": 28800,
-                            "station_configuration": {
-                                "SAPs": [
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "sap1",
-                                        "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_1_name_"
+                                        },
+                                        "name": "target1",
+                                        "subbands": [
                                             177,
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -40300,8 +50482,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -40328,6 +50513,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -40342,6 +50528,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -40359,6 +50546,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -40385,6 +50573,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -40412,6 +50601,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -40420,28 +50610,7 @@
                                             335,
                                             336,
                                             337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
+                                            338
                                         ]
                                     },
                                     {
@@ -40449,88 +50618,20 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+02"
+                                            "target": "_target_2_name_"
                                         },
-                                        "name": "sap2",
+                                        "name": "target2",
                                         "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
                                             177,
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -40554,8 +50655,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -40582,6 +50686,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -40596,6 +50701,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -40613,6 +50719,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -40639,6 +50746,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -40666,6 +50774,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -40674,33 +50783,12 @@
                                             335,
                                             336,
                                             337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
+                                            338
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
-                                "filter": "HBA_110_190",
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -40745,63 +50833,105 @@
                                         ]
                                     },
                                     {
-                                        "max_nr_missing": 2,
+                                        "max_nr_missing": 1,
                                         "stations": [
-                                            "DE601",
-                                            "DE602",
-                                            "DE603",
-                                            "DE604",
-                                            "DE605",
-                                            "DE609",
-                                            "FR606",
-                                            "SE607",
-                                            "UK608",
-                                            "PL610",
-                                            "PL611",
-                                            "PL612",
-                                            "IE613",
-                                            "LV614"
+                                            "RS508",
+                                            "RS509"
                                         ]
                                     },
                                     {
-                                        "max_nr_missing": 1,
+                                        "max_nr_missing": 0,
                                         "stations": [
-                                            "DE601",
-                                            "DE605"
+                                            "RS310",
+                                            "RS210"
                                         ]
                                     }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "Paaa+01Paaa+02REF"
-                                }
+                                ]
                             }
                         },
                         "specifications_template": {
-                            "name": "target observation",
-                            "version": 9
+                            "name": "parallel calibrator target observation",
+                            "version": 10
+                        }
+                    },
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1",
+                        "short_description": "_target_1_name_/1.0/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 2,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2",
+                        "short_description": "_target_2_name_/1.1/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 2,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 16,
-            "id": 41,
+            "version": 22,
+            "id": 53,
             "state_value": "active",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 1 Beam and a parallel Calibrator Beam with a preprocessing pipeline for each.",
-            "name": "IM LBA - 1 Beam",
-            "purpose": "production",
+            "description": "LBA Imaging Observing Strategy using 2 Target Beams and a parallel Calibrator Beam with a preprocessing pipeline for each. Version with demix ignore target parameter.",
+            "name": "IM LBA - 2 Beams",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 7
             },
             "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -40822,9 +50952,9 @@
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Antenna Set",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
                         ]
                     },
                     {
@@ -40834,9 +50964,10 @@
                         ]
                     },
                     {
-                        "name": "Antenna Set",
+                        "name": "Subbands",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
                         ]
                     },
                     {
@@ -40853,9 +50984,15 @@
                         ]
                     },
                     {
-                        "name": "Pipeline description",
+                        "name": "Pipeline 1 description",
                         "refs": [
-                            "#/tasks/Pipeline target/short_description"
+                            "#/tasks/Pipeline target1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline 2 description",
+                        "refs": [
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
@@ -40865,11 +51002,17 @@
                         ]
                     },
                     {
-                        "name": "Target Pointing",
+                        "name": "Target Pointing 1",
                         "refs": [
                             "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
+                    {
+                        "name": "Target Pointing 2",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                        ]
+                    },
                     {
                         "name": "Calibrator Pointing",
                         "refs": [
@@ -40879,27 +51022,63 @@
                     {
                         "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
+                    {
+                        "name": "Time averaging steps demix",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
+                        ]
+                    },
                     {
                         "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Demix Pipeline Target",
+                        "name": "Frequency averaging steps demix",
                         "refs": [
-                            "#/tasks/Pipeline target/specifications_doc/demix"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Demix Pipeline Calibrator",
+                        "name": "Demix sources Pipeline Target 1",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Calibrator",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
                         ]
                     }
                 ],
@@ -40912,17 +51091,17 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.52359877559,
+                            "jupiter": 0.26179938779,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
                         "min_elevation": {
                             "calibrator": 0.52359877559,
-                            "target": 0.69813170079
+                            "target": 0.87266462599
                         },
                         "transit_offset": {
-                            "from": -7200,
-                            "to": 7200
+                            "from": -43200,
+                            "to": 43200
                         }
                     }
                 },
@@ -40955,7 +51134,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target",
+                        "consumer": "Pipeline target1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -40977,6 +51156,29 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target2"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Ingest",
                         "input": {
@@ -41008,7 +51210,26 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -41046,7 +51267,26 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -41077,11 +51317,11 @@
                 "tasks": {
                     "Calibrator Pipeline": {
                         "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "oOOO.O 3Cabc",
+                        "short_description": "3Cabc/1.0/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 2
+                                "frequency_steps": 16,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
@@ -41102,7 +51342,7 @@
                         }
                     },
                     "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
+                        "description": "Clean up all output dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -41110,8 +51350,8 @@
                         }
                     },
                     "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 1 target beam",
-                        "short_description": "OOO.O _Target_name_",
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
+                        "short_description": "_observation_name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -41149,77 +51389,183 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_Target_name_"
+                                            "target": "_target_1_name_"
+                                        },
+                                        "name": "target1",
+                                        "subbands": [
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_2_name_"
                                         },
-                                        "name": "target1",
+                                        "name": "target2",
                                         "subbands": [
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            164,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
                                             177,
                                             178,
                                             179,
@@ -41381,27 +51727,12 @@
                                             335,
                                             336,
                                             337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            348,
-                                            349,
-                                            350,
-                                            351,
-                                            352,
-                                            353
+                                            338
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_10_90",
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -41458,39 +51789,13 @@
                                             "RS310",
                                             "RS210"
                                         ]
-                                    },
-                                    {
-                                        "max_nr_missing": 2,
-                                        "stations": [
-                                            "DE601",
-                                            "DE602",
-                                            "DE603",
-                                            "DE604",
-                                            "DE605",
-                                            "DE609",
-                                            "FR606",
-                                            "SE607",
-                                            "UK608",
-                                            "PL610",
-                                            "PL611",
-                                            "PL612",
-                                            "IE613",
-                                            "LV614"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 1,
-                                        "stations": [
-                                            "DE601",
-                                            "DE605"
-                                        ]
                                     }
                                 ]
                             }
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 9
+                            "version": 10
                         }
                     },
                     "Ingest": {
@@ -41501,12 +51806,38 @@
                             "version": 7
                         }
                     },
-                    "Pipeline target": {
-                        "description": "Preprocessing Pipeline for Target Observation target beam",
-                        "short_description": "oOOO.O _Target_name_",
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1",
+                        "short_description": "_target_1_name_/1.0/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 4,
+                                "frequency_steps": 2,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2",
+                        "short_description": "_target_2_name_/1.1/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 2,
                                 "time_steps": 2
                             },
                             "demix": {
@@ -41529,20 +51860,20 @@
                     }
                 }
             },
-            "version": 11,
-            "id": 42,
+            "version": 23,
+            "id": 54,
             "state_value": "legacy",
-            "purpose_value": "production"
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 1 Beam and a parallel Calibrator Beam with a preprocessing pipeline for each.",
-            "name": "IM LBA - 1 Beam",
+            "description": "LBA Imaging Observing Strategy using 2 Target Beams and a parallel Calibrator Beam with a preprocessing pipeline for each.",
+            "name": "IM LBA - 2 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
                 "version": 8
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
@@ -41565,9 +51896,9 @@
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Antenna Set",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
                         ]
                     },
                     {
@@ -41577,9 +51908,10 @@
                         ]
                     },
                     {
-                        "name": "Antenna Set",
+                        "name": "Subbands",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
                         ]
                     },
                     {
@@ -41596,9 +51928,15 @@
                         ]
                     },
                     {
-                        "name": "Pipeline description",
+                        "name": "Pipeline 1 description",
                         "refs": [
-                            "#/tasks/Pipeline target/short_description"
+                            "#/tasks/Pipeline target1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline 2 description",
+                        "refs": [
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
@@ -41608,11 +51946,17 @@
                         ]
                     },
                     {
-                        "name": "Target Pointing",
+                        "name": "Target Pointing 1",
                         "refs": [
                             "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
+                    {
+                        "name": "Target Pointing 2",
+                        "refs": [
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                        ]
+                    },
                     {
                         "name": "Calibrator Pointing",
                         "refs": [
@@ -41622,27 +51966,51 @@
                     {
                         "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
+                    {
+                        "name": "Time averaging steps demix",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
+                        ]
+                    },
                     {
                         "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Demix Pipeline Target",
+                        "name": "Frequency averaging steps demix",
                         "refs": [
-                            "#/tasks/Pipeline target/specifications_doc/demix"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
                         ]
                     },
                     {
-                        "name": "Demix Pipeline Calibrator",
+                        "name": "Demix sources Pipeline Target 1",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix"
+                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Calibrator",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
                         ]
                     }
                 ],
@@ -41655,17 +52023,17 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.52359877559,
+                            "jupiter": 0.26179938779,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
                         "min_elevation": {
                             "calibrator": 0.52359877559,
-                            "target": 0.69813170079
+                            "target": 0.87266462599
                         },
                         "transit_offset": {
-                            "from": -7200,
-                            "to": 7200
+                            "from": -43200,
+                            "to": 43200
                         }
                     }
                 },
@@ -41698,7 +52066,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target",
+                        "consumer": "Pipeline target1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -41720,6 +52088,29 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target2"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Ingest",
                         "input": {
@@ -41751,7 +52142,26 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -41789,7 +52199,26 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target",
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -41820,11 +52249,11 @@
                 "tasks": {
                     "Calibrator Pipeline": {
                         "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "oOOO.O 3Cabc",
+                        "short_description": "3Cabc/1.0/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 2
+                                "frequency_steps": 16,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
@@ -41845,7 +52274,7 @@
                         }
                     },
                     "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
+                        "description": "Clean up all output dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -41853,8 +52282,8 @@
                         }
                     },
                     "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 1 target beam",
-                        "short_description": "OOO.O _Target_name_",
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
+                        "short_description": "_observation_name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -41892,77 +52321,183 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_Target_name_"
+                                            "target": "_target_1_name_"
+                                        },
+                                        "name": "target1",
+                                        "subbands": [
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_2_name_"
                                         },
-                                        "name": "target1",
+                                        "name": "target2",
                                         "subbands": [
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            164,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
                                             177,
                                             178,
                                             179,
@@ -42124,31 +52659,17 @@
                                             335,
                                             336,
                                             337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            348,
-                                            349,
-                                            350,
-                                            351,
-                                            352,
-                                            353
+                                            338
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_10_90",
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
+                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -42201,39 +52722,13 @@
                                             "RS310",
                                             "RS210"
                                         ]
-                                    },
-                                    {
-                                        "max_nr_missing": 2,
-                                        "stations": [
-                                            "DE601",
-                                            "DE602",
-                                            "DE603",
-                                            "DE604",
-                                            "DE605",
-                                            "DE609",
-                                            "FR606",
-                                            "SE607",
-                                            "UK608",
-                                            "PL610",
-                                            "PL611",
-                                            "PL612",
-                                            "IE613",
-                                            "LV614"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 1,
-                                        "stations": [
-                                            "DE601",
-                                            "DE605"
-                                        ]
                                     }
                                 ]
                             }
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 10
+                            "version": 9
                         }
                     },
                     "Ingest": {
@@ -42244,12 +52739,38 @@
                             "version": 7
                         }
                     },
-                    "Pipeline target": {
-                        "description": "Preprocessing Pipeline for Target Observation target beam",
-                        "short_description": "oOOO.O _Target_name_",
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1",
+                        "short_description": "_target_1_name_/1.0/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 4,
+                                "frequency_steps": 2,
+                                "time_steps": 2
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2",
+                        "short_description": "_target_2_name_/1.1/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 2,
                                 "time_steps": 2
                             },
                             "demix": {
@@ -42272,22 +52793,22 @@
                     }
                 }
             },
-            "version": 12,
-            "id": 43,
-            "state_value": "active",
+            "version": 8,
+            "id": 55,
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 2 Target Beams and a parallel Calibrator Beam with a preprocessing pipeline for each.",
-            "name": "IM LBA - 2 Beams",
+            "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
+            "name": "IM LBA LoDSS - 5 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 7
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -42308,47 +52829,46 @@
                         ]
                     },
                     {
-                        "name": "Antenna Set",
+                        "name": "Run ADDER QA",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
+                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
                         ]
                     },
                     {
-                        "name": "Filter",
+                        "name": "Observation description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
+                            "#/tasks/Combined Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Pipeline 1 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Run ADDER QA",
+                        "name": "Pipeline 2 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Observation description",
+                        "name": "Pipeline 3 description",
                         "refs": [
-                            "#/tasks/Combined Observation/short_description"
+                            "#/tasks/Pipeline target3/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 description",
+                        "name": "Pipeline 4 description",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Pipeline target4/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 description",
+                        "name": "Pipeline 5 description",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Pipeline target5/short_description"
                         ]
                     },
                     {
@@ -42370,59 +52890,45 @@
                         ]
                     },
                     {
-                        "name": "Calibrator Pointing",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Time averaging steps",
-                        "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
-                        ]
-                    },
-                    {
-                        "name": "Time averaging steps demix",
+                        "name": "Target Pointing 3",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps",
+                        "name": "Target Pointing 4",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps demix",
+                        "name": "Target Pointing 5",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 1",
+                        "name": "Calibrator Pointing",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 2",
+                        "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Calibrator",
+                        "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     }
                 ],
@@ -42435,27 +52941,203 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
+                            "jupiter": 0.52359877559,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
-                        "min_elevation": {
-                            "calibrator": 0.52359877559,
-                            "target": 0.87266462599
+                        "min_elevation": {
+                            "calibrator": 0.52359877559,
+                            "target": 0.87266462599
+                        },
+                        "transit_offset": {
+                            "from": -14400,
+                            "to": 14400
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "calibrator"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target1",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target1"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target2"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target3",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target3"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target4",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target4"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target5",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target5"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
+                    },
                     {
-                        "consumer": "Calibrator Pipeline",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -42464,21 +53146,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "calibrator"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target1",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -42487,21 +53165,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target1"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target2",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -42510,16 +53184,12 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target2"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target4",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
@@ -42535,7 +53205,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Pipeline target5",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -42543,7 +53213,26 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -42562,7 +53251,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -42590,9 +53279,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Combined Observation",
+                        "producer": "Pipeline target3",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -42611,7 +53300,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target1",
+                        "producer": "Pipeline target4",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -42630,7 +53319,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target2",
+                        "producer": "Pipeline target5",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -42660,18 +53349,26 @@
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "description": "Preprocessing Pipeline for Calibrator Observation. No demix, Flagging LBA_default, Dysco=enabled",
                         "short_description": "3Cabc/1.0/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 16,
-                                "time_steps": 4
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -42686,7 +53383,7 @@
                         }
                     },
                     "Cleanup": {
-                        "description": "Clean up all output dataproducts from disk after ingest",
+                        "description": "Clean up all dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -42694,12 +53391,12 @@
                         }
                     },
                     "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
-                        "short_description": "_observation_name_",
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams. Dutch stations only, 200 MHz, 10-90 MHz filter",
+                        "short_description": "oXXX Paaa+01 3Cabc",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -42707,7 +53404,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": true
+                                    "enabled": false
                                 }
                             },
                             "calibrator": {
@@ -42717,7 +53414,7 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3Cabc"
+                                    "target": "_calibrator_name_"
                                 }
                             },
                             "correlator": {
@@ -42733,172 +53430,275 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_1_name_"
+                                            "target": "Paaa+01"
                                         },
                                         "name": "target1",
                                         "subbands": [
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
+                                        },
+                                        "name": "target2",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+03"
+                                        },
+                                        "name": "target3",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
                                         ]
                                     },
                                     {
@@ -42906,181 +53706,193 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_2_name_"
+                                            "target": "Paaa+04"
                                         },
-                                        "name": "target2",
+                                        "name": "target4",
                                         "subbands": [
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+05"
+                                        },
+                                        "name": "target5",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_30_90",
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
+                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -43139,7 +53951,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 10
+                            "version": 8
                         }
                     },
                     "Ingest": {
@@ -43151,18 +53963,128 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1",
-                        "short_description": "_target_1_name_/1.0/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+01/1.0/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 2,
-                                "time_steps": 2
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+02/1.1/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target3": {
+                        "description": "Preprocessing Pipeline for Target Observation target3. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+03/1.2/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target4": {
+                        "description": "Preprocessing Pipeline for Target Observation target4. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+04/1.3/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -43176,19 +54098,27 @@
                             "version": 8
                         }
                     },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2",
-                        "short_description": "_target_2_name_/1.1/TP",
+                    "Pipeline target5": {
+                        "description": "Preprocessing Pipeline for Target Observation target5. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+05/1.4/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 2,
-                                "time_steps": 2
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -43204,22 +54134,22 @@
                     }
                 }
             },
-            "version": 22,
-            "id": 44,
-            "state_value": "active",
+            "version": 45,
+            "id": 56,
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 2 Target Beams and a parallel Calibrator Beam with a preprocessing pipeline for each. Version with demix ignore target parameter.",
-            "name": "IM LBA - 2 Beams",
-            "purpose": "technical_commissioning",
+            "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
+            "name": "IM LBA LoDSS - 5 Beams",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 8
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -43239,25 +54169,6 @@
                             "#/tasks/Combined Observation/specifications_doc/duration"
                         ]
                     },
-                    {
-                        "name": "Antenna Set",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
-                        ]
-                    },
-                    {
-                        "name": "Filter",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
-                        ]
-                    },
-                    {
-                        "name": "Subbands",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
-                        ]
-                    },
                     {
                         "name": "Run ADDER QA",
                         "refs": [
@@ -43284,89 +54195,81 @@
                         ]
                     },
                     {
-                        "name": "Pipeline Calibrator description",
-                        "refs": [
-                            "#/tasks/Calibrator Pipeline/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 1",
+                        "name": "Pipeline 3 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                            "#/tasks/Pipeline target3/short_description"
                         ]
                     },
                     {
-                        "name": "Target Pointing 2",
+                        "name": "Pipeline 4 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                            "#/tasks/Pipeline target4/short_description"
                         ]
                     },
                     {
-                        "name": "Calibrator Pointing",
+                        "name": "Pipeline 5 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target5/short_description"
                         ]
                     },
                     {
-                        "name": "Time averaging steps",
+                        "name": "Pipeline Calibrator description",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
+                            "#/tasks/Calibrator Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Time averaging steps demix",
+                        "name": "Target Pointing 1",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps",
+                        "name": "Target Pointing 2",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps demix",
+                        "name": "Target Pointing 3",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 1",
+                        "name": "Target Pointing 4",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Demix ignore target Pipeline Target 1",
+                        "name": "Target Pointing 5",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 2",
+                        "name": "Calibrator Pointing",
                         "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Demix ignore target Pipeline Target 2",
+                        "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Calibrator",
+                        "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     }
                 ],
@@ -43379,7 +54282,7 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
+                            "jupiter": 0.52359877559,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
@@ -43388,8 +54291,8 @@
                             "target": 0.87266462599
                         },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -14400,
+                            "to": 14400
                         }
                     }
                 },
@@ -43467,6 +54370,75 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Pipeline target3",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target3"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target4",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target4"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target5",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target5"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Ingest",
                         "input": {
@@ -43524,6 +54496,63 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target4",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target5",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -43581,6 +54610,63 @@
                             "version": 6
                         }
                     },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target4",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target5",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -43604,18 +54690,26 @@
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "description": "Preprocessing Pipeline for Calibrator Observation. No demix, Flagging LBA_default, Dysco=enabled",
                         "short_description": "3Cabc/1.0/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 16,
-                                "time_steps": 4
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -43630,7 +54724,7 @@
                         }
                     },
                     "Cleanup": {
-                        "description": "Clean up all output dataproducts from disk after ingest",
+                        "description": "Clean up all dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -43638,12 +54732,12 @@
                         }
                     },
                     "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
-                        "short_description": "_observation_name_",
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams. Dutch stations only, 200 MHz, 10-90 MHz filter",
+                        "short_description": "oXXX Paaa+01 3Cabc",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -43651,7 +54745,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": true
+                                    "enabled": false
                                 }
                             },
                             "calibrator": {
@@ -43661,7 +54755,7 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3Cabc"
+                                    "target": "_calibrator_name_"
                                 }
                             },
                             "correlator": {
@@ -43677,172 +54771,275 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_1_name_"
+                                            "target": "Paaa+01"
+                                        },
+                                        "name": "target1",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
+                                        },
+                                        "name": "target2",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+03"
                                         },
-                                        "name": "target1",
+                                        "name": "target3",
                                         "subbands": [
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
                                         ]
                                     },
                                     {
@@ -43850,181 +55047,193 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_2_name_"
+                                            "target": "Paaa+04"
                                         },
-                                        "name": "target2",
+                                        "name": "target4",
                                         "subbands": [
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+05"
+                                        },
+                                        "name": "target5",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_30_90",
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
+                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -44083,7 +55292,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 10
+                            "version": 9
                         }
                     },
                     "Ingest": {
@@ -44095,18 +55304,26 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1",
-                        "short_description": "_target_1_name_/1.0/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+01/1.0/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 2,
-                                "time_steps": 2
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -44121,18 +55338,128 @@
                         }
                     },
                     "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2",
-                        "short_description": "_target_2_name_/1.1/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target2. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+02/1.1/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 2,
-                                "time_steps": 2
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target3": {
+                        "description": "Preprocessing Pipeline for Target Observation target3. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+03/1.2/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target4": {
+                        "description": "Preprocessing Pipeline for Target Observation target4. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+04/1.3/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target5": {
+                        "description": "Preprocessing Pipeline for Target Observation target5. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+05/1.4/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -44148,22 +55475,22 @@
                     }
                 }
             },
-            "version": 23,
-            "id": 45,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
+            "version": 46,
+            "id": 57,
+            "state_value": "legacy",
+            "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 2 Target Beams and a parallel Calibrator Beam with a preprocessing pipeline for each.",
-            "name": "IM LBA - 2 Beams",
+            "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
+            "name": "IM LBA LoDSS - 5 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
-            "state": "legacy",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -44184,47 +55511,46 @@
                         ]
                     },
                     {
-                        "name": "Antenna Set",
+                        "name": "Run ADDER QA",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
+                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
                         ]
                     },
                     {
-                        "name": "Filter",
+                        "name": "Observation description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
+                            "#/tasks/Combined Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Pipeline 1 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Run ADDER QA",
+                        "name": "Pipeline 2 description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Observation description",
+                        "name": "Pipeline 3 description",
                         "refs": [
-                            "#/tasks/Combined Observation/short_description"
+                            "#/tasks/Pipeline target3/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 description",
+                        "name": "Pipeline 4 description",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Pipeline target4/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 description",
+                        "name": "Pipeline 5 description",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Pipeline target5/short_description"
                         ]
                     },
                     {
@@ -44246,59 +55572,45 @@
                         ]
                     },
                     {
-                        "name": "Calibrator Pointing",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Time averaging steps",
-                        "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
-                        ]
-                    },
-                    {
-                        "name": "Time averaging steps demix",
+                        "name": "Target Pointing 3",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps",
+                        "name": "Target Pointing 4",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps demix",
+                        "name": "Target Pointing 5",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
+                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 1",
+                        "name": "Calibrator Pointing",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 2",
+                        "name": "Time averaging steps",
                         "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+                            "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Calibrator",
+                        "name": "Frequency averaging steps",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+                            "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
+                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
                     }
                 ],
@@ -44311,27 +55623,205 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.52359877559,
-                            "sun": 0.52359877559
+                            "target": {
+                                "jupiter": 0.52359877559,
+                                "moon": 0.52359877559,
+                                "sun": 0.52359877559
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0.52359877559,
                             "target": 0.87266462599
                         },
-                        "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                        "transit_offset": {
+                            "from": -14400,
+                            "to": 14400
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 11
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "calibrator"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target1",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target1"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target2"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target3",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target3"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target4",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target4"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target5",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target5"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
+                    },
                     {
-                        "consumer": "Calibrator Pipeline",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -44340,21 +55830,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "calibrator"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target1",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -44363,21 +55849,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target1"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target2",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -44386,16 +55868,12 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target2"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target4",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
@@ -44411,7 +55889,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Pipeline target5",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -44419,7 +55897,26 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Combined Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -44438,7 +55935,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -44466,9 +55963,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Combined Observation",
+                        "producer": "Pipeline target3",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -44487,7 +55984,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target1",
+                        "producer": "Pipeline target4",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -44506,7 +56003,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target2",
+                        "producer": "Pipeline target5",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -44536,18 +56033,26 @@
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "description": "Preprocessing Pipeline for Calibrator Observation. No demix, Flagging LBA_default, Dysco=enabled",
                         "short_description": "3Cabc/1.0/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 16,
-                                "time_steps": 4
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -44562,7 +56067,7 @@
                         }
                     },
                     "Cleanup": {
-                        "description": "Clean up all output dataproducts from disk after ingest",
+                        "description": "Clean up all dataproducts from disk after ingest",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
@@ -44570,12 +56075,12 @@
                         }
                     },
                     "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
-                        "short_description": "_observation_name_",
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams. Dutch stations only, 200 MHz, 10-90 MHz filter",
+                        "short_description": "oXXX Paaa+01 3Cabc",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -44583,7 +56088,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": true
+                                    "enabled": false
                                 }
                             },
                             "calibrator": {
@@ -44593,7 +56098,7 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "3Cabc"
+                                    "target": "_calibrator_name_"
                                 }
                             },
                             "correlator": {
@@ -44609,172 +56114,275 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_1_name_"
+                                            "target": "Paaa+01"
                                         },
                                         "name": "target1",
                                         "subbands": [
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+02"
+                                        },
+                                        "name": "target2",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+03"
+                                        },
+                                        "name": "target3",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
                                         ]
                                     },
                                     {
@@ -44782,182 +56390,192 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_target_2_name_"
+                                            "target": "Paaa+04"
                                         },
-                                        "name": "target2",
+                                        "name": "target4",
                                         "subbands": [
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
-                                            183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+05"
+                                        },
+                                        "name": "target5",
+                                        "subbands": [
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_OUTER",
-                                "filter": "LBA_30_90",
+                                "antenna_set": "LBA_SPARSE_EVEN",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -45016,7 +56634,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 9
+                            "version": 11
                         }
                     },
                     "Ingest": {
@@ -45028,18 +56646,26 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1",
-                        "short_description": "_target_1_name_/1.0/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+01/1.0/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 2,
-                                "time_steps": 2
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -45054,18 +56680,128 @@
                         }
                     },
                     "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2",
-                        "short_description": "_target_2_name_/1.1/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target2. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+02/1.1/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 2,
-                                "time_steps": 2
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target3": {
+                        "description": "Preprocessing Pipeline for Target Observation target3. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+03/1.2/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target4": {
+                        "description": "Preprocessing Pipeline for Target Observation target4. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+04/1.3/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target5": {
+                        "description": "Preprocessing Pipeline for Target Observation target5. No demix, Flagging LBA_default, Dysco=enabled",
+                        "short_description": "Paaa+05/1.4/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 1,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 41,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -45081,14 +56817,14 @@
                     }
                 }
             },
-            "version": 8,
-            "id": 46,
-            "state_value": "legacy",
+            "version": 49,
+            "id": 58,
+            "state_value": "active",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
-            "name": "IM LBA LoDSS - 5 Beams",
+            "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA High Survey and LBA Co-observing.",
+            "name": "IM LBA Survey - 3 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
@@ -45147,18 +56883,6 @@
                             "#/tasks/Pipeline target3/short_description"
                         ]
                     },
-                    {
-                        "name": "Pipeline 4 description",
-                        "refs": [
-                            "#/tasks/Pipeline target4/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 5 description",
-                        "refs": [
-                            "#/tasks/Pipeline target5/short_description"
-                        ]
-                    },
                     {
                         "name": "Pipeline Calibrator description",
                         "refs": [
@@ -45183,18 +56907,6 @@
                             "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
-                    {
-                        "name": "Target Pointing 4",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 5",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
-                        ]
-                    },
                     {
                         "name": "Calibrator Pointing",
                         "refs": [
@@ -45218,6 +56930,48 @@
                             "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 3",
+                        "refs": [
+                            "#/tasks/Pipeline target3/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 3",
+                        "refs": [
+                            "#/tasks/Pipeline target3/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Calibrator",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
@@ -45229,7 +56983,7 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.52359877559,
+                            "jupiter": 0.26179938779,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
@@ -45340,52 +57094,6 @@
                             "version": 6
                         }
                     },
-                    {
-                        "consumer": "Pipeline target4",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target4"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target5",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target5"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
                     {
                         "consumer": "Ingest",
                         "input": {
@@ -45462,44 +57170,6 @@
                             "version": 6
                         }
                     },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target4",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target5",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -45556,437 +57226,248 @@
                             "name": "all",
                             "version": 6
                         }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target3",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target4",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target5",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [],
-                "tasks": {
-                    "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "3Cabc/1.0/CP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams. Dutch stations only, 200 MHz, 10-90 MHz filter",
-                        "short_description": "oXXX Paaa+01 3Cabc",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "_calibrator_name_"
-                                }
-                            },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4"
-                            },
-                            "duration": 120,
-                            "station_configuration": {
-                                "SAPs": [
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "target1",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+02"
-                                        },
-                                        "name": "target2",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "c17 oOOO.O 3Cabc",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 8,
+                                "time_steps": 4
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Combined Observation": {
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 3 target beams",
+                        "short_description": "OOO.O Paaa+01 Paaa+02 Paaa+03",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": true,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": true
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
                                     {
                                         "digital_pointing": {
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+03"
+                                            "target": "Paaa+01"
                                         },
-                                        "name": "target3",
+                                        "name": "target1",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     },
                                     {
@@ -45994,91 +57475,132 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+04"
+                                            "target": "Paaa+02"
                                         },
-                                        "name": "target4",
+                                        "name": "target2",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     },
                                     {
@@ -46086,96 +57608,137 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+05"
+                                            "target": "Paaa+03"
                                         },
-                                        "name": "target5",
+                                        "name": "target3",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     }
                                 ],
                                 "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_10_90",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -46251,26 +57814,18 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+01/1.0/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1",
+                        "short_description": "c17 oOOO.O Paaa+01",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -46285,26 +57840,18 @@
                         }
                     },
                     "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+02/1.1/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target2",
+                        "short_description": "c17 oOOO.O Paaa+02",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -46319,94 +57866,18 @@
                         }
                     },
                     "Pipeline target3": {
-                        "description": "Preprocessing Pipeline for Target Observation target3. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+03/1.2/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target4": {
-                        "description": "Preprocessing Pipeline for Target Observation target4. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+04/1.3/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target5": {
-                        "description": "Preprocessing Pipeline for Target Observation target5. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+05/1.4/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target3",
+                        "short_description": "c17 oOOO.O Paaa+03",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -46422,14 +57893,14 @@
                     }
                 }
             },
-            "version": 45,
-            "id": 47,
+            "version": 28,
+            "id": 59,
             "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
-            "name": "IM LBA LoDSS - 5 Beams",
+            "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA High Survey and LBA Co-observing.",
+            "name": "IM LBA Survey - 3 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
@@ -46488,18 +57959,6 @@
                             "#/tasks/Pipeline target3/short_description"
                         ]
                     },
-                    {
-                        "name": "Pipeline 4 description",
-                        "refs": [
-                            "#/tasks/Pipeline target4/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 5 description",
-                        "refs": [
-                            "#/tasks/Pipeline target5/short_description"
-                        ]
-                    },
                     {
                         "name": "Pipeline Calibrator description",
                         "refs": [
@@ -46524,18 +57983,6 @@
                             "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
-                    {
-                        "name": "Target Pointing 4",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 5",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
-                        ]
-                    },
                     {
                         "name": "Calibrator Pointing",
                         "refs": [
@@ -46559,6 +58006,48 @@
                             "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 3",
+                        "refs": [
+                            "#/tasks/Pipeline target3/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 3",
+                        "refs": [
+                            "#/tasks/Pipeline target3/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Calibrator",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
@@ -46570,7 +58059,7 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.52359877559,
+                            "jupiter": 0.26179938779,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
@@ -46604,99 +58093,7 @@
                         "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "calibrator"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target1",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target1"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target2"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target3",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target3"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target4",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target4"
+                                "calibrator"
                             ]
                         },
                         "selection_template": {
@@ -46705,7 +58102,7 @@
                         }
                     },
                     {
-                        "consumer": "Pipeline target5",
+                        "consumer": "Pipeline target1",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -46719,7 +58116,7 @@
                         "producer": "Combined Observation",
                         "selection_doc": {
                             "sap": [
-                                "target5"
+                                "target1"
                             ]
                         },
                         "selection_template": {
@@ -46728,7 +58125,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Pipeline target2",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -46737,36 +58134,21 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target2"
+                            ]
                         },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Pipeline target3",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -46775,31 +58157,16 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                        "producer": "Combined Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "target3"
+                            ]
                         },
-                        "producer": "Pipeline target3",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
@@ -46815,7 +58182,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target4",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -46834,44 +58201,6 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target5",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
                         "producer": "Pipeline target1",
                         "selection_doc": {},
                         "selection_template": {
@@ -46880,7 +58209,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -46899,7 +58228,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -46927,499 +58256,294 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target4",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target5",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Combined Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
                             "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [],
-                "tasks": {
-                    "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "3Cabc/1.0/CP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams. Dutch stations only, 200 MHz, 10-90 MHz filter",
-                        "short_description": "oXXX Paaa+01 3Cabc",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "_calibrator_name_"
-                                }
-                            },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4"
-                            },
-                            "duration": 120,
-                            "station_configuration": {
-                                "SAPs": [
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "target1",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+02"
-                                        },
-                                        "name": "target2",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+03"
-                                        },
-                                        "name": "target3",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Calibrator Pipeline": {
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "c17 oOOO.O 3Cabc",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 8,
+                                "time_steps": 4
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 8
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "LBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Clean up all dataproducts from disk after ingest",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Combined Observation": {
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 3 target beams",
+                        "short_description": "OOO.O Paaa+01 Paaa+02 Paaa+03",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": true,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": true
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cabc"
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
                                     {
                                         "digital_pointing": {
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+04"
+                                            "target": "Paaa+01"
                                         },
-                                        "name": "target4",
+                                        "name": "target1",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     },
                                     {
@@ -47427,96 +58551,270 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+05"
+                                            "target": "Paaa+02"
                                         },
-                                        "name": "target5",
+                                        "name": "target2",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+03"
+                                        },
+                                        "name": "target3",
+                                        "subbands": [
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     }
                                 ],
                                 "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_10_90",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -47592,26 +58890,18 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+01/1.0/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1",
+                        "short_description": "c17 oOOO.O Paaa+01",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -47626,26 +58916,18 @@
                         }
                     },
                     "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+02/1.1/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target2",
+                        "short_description": "c17 oOOO.O Paaa+02",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -47660,94 +58942,18 @@
                         }
                     },
                     "Pipeline target3": {
-                        "description": "Preprocessing Pipeline for Target Observation target3. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+03/1.2/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target4": {
-                        "description": "Preprocessing Pipeline for Target Observation target4. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+04/1.3/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target5": {
-                        "description": "Preprocessing Pipeline for Target Observation target5. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+05/1.4/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target3",
+                        "short_description": "c17 oOOO.O Paaa+03",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -47763,22 +58969,22 @@
                     }
                 }
             },
-            "version": 46,
-            "id": 48,
+            "version": 29,
+            "id": 60,
             "state_value": "legacy",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
-            "name": "IM LBA LoDSS - 5 Beams",
+            "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA High Survey and LBA Co-observing.",
+            "name": "IM LBA Survey - 3 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 8
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -47829,18 +59035,6 @@
                             "#/tasks/Pipeline target3/short_description"
                         ]
                     },
-                    {
-                        "name": "Pipeline 4 description",
-                        "refs": [
-                            "#/tasks/Pipeline target4/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 5 description",
-                        "refs": [
-                            "#/tasks/Pipeline target5/short_description"
-                        ]
-                    },
                     {
                         "name": "Pipeline Calibrator description",
                         "refs": [
@@ -47865,18 +59059,6 @@
                             "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
-                    {
-                        "name": "Target Pointing 4",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 5",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
-                        ]
-                    },
                     {
                         "name": "Calibrator Pointing",
                         "refs": [
@@ -47900,6 +59082,48 @@
                             "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
                             "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
                         ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 1",
+                        "refs": [
+                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 2",
+                        "refs": [
+                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Target 3",
+                        "refs": [
+                            "#/tasks/Pipeline target3/specifications_doc/demix/sources"
+                        ]
+                    },
+                    {
+                        "name": "Demix ignore target Pipeline Target 3",
+                        "refs": [
+                            "#/tasks/Pipeline target3/specifications_doc/demix/ignore_target"
+                        ]
+                    },
+                    {
+                        "name": "Demix sources Pipeline Calibrator",
+                        "refs": [
+                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                        ]
                     }
                 ],
                 "scheduling_constraints_doc": {
@@ -47911,7 +59135,7 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.52359877559,
+                            "jupiter": 0.26179938779,
                             "moon": 0.52359877559,
                             "sun": 0.52359877559
                         },
@@ -48015,132 +59239,10 @@
                         "selection_doc": {
                             "sap": [
                                 "target3"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target4",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target4"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target5",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target5"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                            ]
                         },
-                        "producer": "Pipeline target3",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
@@ -48156,7 +59258,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target4",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48175,7 +59277,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target5",
+                        "producer": "Pipeline target1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48183,7 +59285,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -48192,9 +59294,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Combined Observation",
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48202,7 +59304,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -48213,7 +59315,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target1",
+                        "producer": "Pipeline target3",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48230,9 +59332,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Pipeline target2",
+                        "producer": "Combined Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48251,7 +59353,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target3",
+                        "producer": "Pipeline target1",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48270,7 +59372,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target4",
+                        "producer": "Pipeline target2",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48289,7 +59391,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target5",
+                        "producer": "Pipeline target3",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -48319,26 +59421,18 @@
                 "task_scheduling_relations": [],
                 "tasks": {
                     "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "3Cabc/1.0/CP",
+                        "description": "Preprocessing Pipeline for Calibrator Observation",
+                        "short_description": "c17 oOOO.O 3Cabc",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -48361,12 +59455,12 @@
                         }
                     },
                     "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams. Dutch stations only, 200 MHz, 10-90 MHz filter",
-                        "short_description": "oXXX Paaa+01 3Cabc",
+                        "description": "Combined parallel Calibrator & Target Observation for LBA with 3 target beams",
+                        "short_description": "OOO.O Paaa+01 Paaa+02 Paaa+03",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": false,
+                                    "enabled": true,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -48374,7 +59468,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": false
+                                    "enabled": true
                                 }
                             },
                             "calibrator": {
@@ -48384,7 +59478,7 @@
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "_calibrator_name_"
+                                    "target": "3Cabc"
                                 }
                             },
                             "correlator": {
@@ -48404,363 +59498,128 @@
                                         },
                                         "name": "target1",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+02"
-                                        },
-                                        "name": "target2",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+03"
-                                        },
-                                        "name": "target3",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+04"
-                                        },
-                                        "name": "target4",
-                                        "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     },
                                     {
@@ -48768,96 +59627,270 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+05"
+                                            "target": "Paaa+02"
                                         },
-                                        "name": "target5",
+                                        "name": "target2",
                                         "subbands": [
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "Paaa+03"
+                                        },
+                                        "name": "target3",
+                                        "subbands": [
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338
                                         ]
                                     }
                                 ],
                                 "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_10_90",
+                                "filter": "LBA_30_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -48920,7 +59953,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 10
+                            "version": 9
                         }
                     },
                     "Ingest": {
@@ -48932,26 +59965,18 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+01/1.0/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1",
+                        "short_description": "c17 oOOO.O Paaa+01",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -48966,26 +59991,18 @@
                         }
                     },
                     "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+02/1.1/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target2",
+                        "short_description": "c17 oOOO.O Paaa+02",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -49000,94 +60017,18 @@
                         }
                     },
                     "Pipeline target3": {
-                        "description": "Preprocessing Pipeline for Target Observation target3. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+03/1.2/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target4": {
-                        "description": "Preprocessing Pipeline for Target Observation target4. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+04/1.3/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target5": {
-                        "description": "Preprocessing Pipeline for Target Observation target5. No demix, Flagging LBA_default, Dysco=enabled",
-                        "short_description": "Paaa+05/1.4/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target3",
+                        "short_description": "c17 oOOO.O Paaa+03",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 1,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 41,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
+                                "frequency_steps": 8,
+                                "time_steps": 4
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 10
+                                "time_steps": 8
                             },
                             "flag": {
                                 "autocorrelations": true,
@@ -49103,9 +60044,9 @@
                     }
                 }
             },
-            "version": 49,
-            "id": 49,
-            "state_value": "active",
+            "version": 30,
+            "id": 61,
+            "state_value": "legacy",
             "purpose_value": "production"
         },
         {
@@ -50029,7 +60970,6 @@
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -50088,7 +61028,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 8
+                            "version": 10
                         }
                     },
                     "Ingest": {
@@ -50179,8 +61119,8 @@
                     }
                 }
             },
-            "version": 28,
-            "id": 50,
+            "version": 38,
+            "id": 62,
             "state_value": "legacy",
             "purpose_value": "production"
         },
@@ -50190,11 +61130,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
-            "state": "legacy",
+            "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -50345,9 +61285,11 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.52359877559,
-                            "sun": 0.52359877559
+                            "target": {
+                                "jupiter": 0.26179938779,
+                                "moon": 0.52359877559,
+                                "sun": 0.52359877559
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0.52359877559,
@@ -50361,7 +61303,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -51105,7 +62047,6 @@
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
-                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -51121,7 +62062,6 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
-                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -51164,7 +62104,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target observation",
-                            "version": 9
+                            "version": 11
                         }
                     },
                     "Ingest": {
@@ -51255,27 +62195,27 @@
                     }
                 }
             },
-            "version": 29,
-            "id": 51,
-            "state_value": "legacy",
+            "version": 39,
+            "id": 63,
+            "state_value": "active",
             "purpose_value": "production"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA High Survey and LBA Co-observing.",
-            "name": "IM LBA Survey - 3 Beams",
-            "purpose": "production",
+            "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
+            "name": "IM RT HBA - 1 beam",
+            "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 5
             },
-            "state": "legacy",
+            "state": "development",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -51285,274 +62225,99 @@
                         ]
                     },
                     {
-                        "name": "Duration",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/duration"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Run ADDER QA",
+                        "name": "Pipeline Description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+                            "#/tasks/Target Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Observation description",
+                        "name": "Target Pointing",
                         "refs": [
-                            "#/tasks/Combined Observation/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 description",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 description",
+                        "name": "Subbands",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
                         ]
                     },
                     {
-                        "name": "Pipeline 3 description",
+                        "name": "Calibrator Observation Description",
                         "refs": [
-                            "#/tasks/Pipeline target3/short_description"
+                            "#/tasks/Calibrator Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline Calibrator description",
+                        "name": "Calibrator Pipeline Description",
                         "refs": [
                             "#/tasks/Calibrator Pipeline/short_description"
                         ]
                     },
                     {
-                        "name": "Target Pointing 1",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 2",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 3",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Pointing",
-                        "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Time averaging steps",
-                        "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
-                        ]
-                    },
-                    {
-                        "name": "Frequency averaging steps",
-                        "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
-                        ]
-                    },
-                    {
-                        "name": "Demix sources Pipeline Target 1",
-                        "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
-                        ]
-                    },
-                    {
-                        "name": "Demix ignore target Pipeline Target 1",
-                        "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
-                        ]
-                    },
-                    {
-                        "name": "Demix sources Pipeline Target 2",
-                        "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
-                        ]
-                    },
-                    {
-                        "name": "Demix ignore target Pipeline Target 2",
-                        "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
-                        ]
-                    },
-                    {
-                        "name": "Demix sources Pipeline Target 3",
+                        "name": "Calibrator Observation Pointing",
                         "refs": [
-                            "#/tasks/Pipeline target3/specifications_doc/demix/sources"
+                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Demix ignore target Pipeline Target 3",
+                        "name": "Calibrator Duration",
                         "refs": [
-                            "#/tasks/Pipeline target3/specifications_doc/demix/ignore_target"
+                            "#/tasks/Calibrator Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Calibrator",
+                        "name": "Run ADDER",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
-                    },
-                    "scheduler": "dynamic",
+                    "scheduler": "fixed_time",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.52359877559,
-                            "sun": 0.52359877559
+                            "jupiter": 0,
+                            "moon": 0.008726646259971648,
+                            "sun": 0.008726646259971648
                         },
                         "min_elevation": {
-                            "calibrator": 0.52359877559,
-                            "target": 0.87266462599
+                            "calibrator": 0.3490658503988659,
+                            "target": 0.3490658503988659
                         },
                         "transit_offset": {
-                            "from": -14400,
-                            "to": 14400
-                        }
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
-                    {
-                        "consumer": "Calibrator Pipeline",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "calibrator"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target1",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target1"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target2"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target3",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target3"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
+                            "from": -43200,
+                            "to": 43200
                         }
                     },
+                    "time": {
+                        "at": "2023-05-04T12:40:00",
+                        "between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Target Pipeline",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -51561,17 +62326,21 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap1"
+                            ]
                         },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
                         "selection_template": {
-                            "name": "all",
+                            "name": "SAP",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Calibrator Pipeline",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -51580,9 +62349,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Pipeline target2",
+                        "producer": "Calibrator Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -51601,7 +62370,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target3",
+                        "producer": "Target Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -51609,7 +62378,7 @@
                         }
                     },
                     {
-                        "consumer": "Cleanup",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -51618,9 +62387,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Combined Observation",
+                        "producer": "Calibrator Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -51637,9 +62406,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Pipeline target1",
+                        "producer": "Target Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -51658,7 +62427,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target2",
+                        "producer": "Target Pipeline",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -51675,9 +62444,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Pipeline target3",
+                        "producer": "Calibrator Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -51704,26 +62473,75 @@
                         }
                     }
                 ],
-                "task_scheduling_relations": [],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
                 "tasks": {
+                    "Calibrator Observation": {
+                        "description": "Calibrator Observation. After the Target Observation",
+                        "short_description": "_Calibrator_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 8
+                        }
+                    },
                     "Calibrator Pipeline": {
                         "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "c17 oOOO.O 3Cabc",
+                        "short_description": "_Calibrator_Name_/CP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
+                                "rfi_strategy": "HBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -51740,13 +62558,21 @@
                             "version": 7
                         }
                     },
-                    "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 3 target beams",
-                        "short_description": "OOO.O Paaa+01 Paaa+02 Paaa+03",
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation for Responsive Telescope scheduling unit. NL stations, HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+                        "short_description": "_Triggered_Observation_Name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -51754,17 +62580,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": true
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cabc"
+                                    "enabled": false
                                 }
                             },
                             "correlator": {
@@ -51772,7 +62588,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 120,
+                            "duration": 7200,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -51780,276 +62596,115 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "target1",
-                                        "subbands": [
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+02"
-                                        },
-                                        "name": "target2",
-                                        "subbands": [
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+03"
+                                            "target": "_Triggered_Target_"
                                         },
-                                        "name": "target3",
+                                        "name": "sap1",
                                         "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
                                             217,
                                             218,
                                             219,
@@ -52074,7 +62729,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -52089,7 +62743,6 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
@@ -52107,7 +62760,6 @@
                                             271,
                                             272,
                                             273,
-                                            274,
                                             275,
                                             276,
                                             277,
@@ -52134,7 +62786,6 @@
                                             298,
                                             299,
                                             300,
-                                            301,
                                             302,
                                             303,
                                             304,
@@ -52162,7 +62813,6 @@
                                             326,
                                             327,
                                             328,
-                                            329,
                                             330,
                                             331,
                                             332,
@@ -52171,12 +62821,33 @@
                                             335,
                                             336,
                                             337,
-                                            338
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_30_90",
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -52196,7 +62867,6 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
-                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -52219,107 +62889,47 @@
                                             "RS508",
                                             "RS509"
                                         ]
-                                    },
-                                    {
-                                        "max_nr_missing": 1,
-                                        "stations": [
-                                            "RS508",
-                                            "RS509"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 0,
-                                        "stations": [
-                                            "RS310",
-                                            "RS210"
-                                        ]
                                     }
-                                ]
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_Triggered_Target_"
+                                }
                             }
                         },
                         "specifications_template": {
-                            "name": "parallel calibrator target observation",
+                            "name": "target observation",
                             "version": 9
                         }
                     },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1",
-                        "short_description": "c17 oOOO.O Paaa+01",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 8
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2",
-                        "short_description": "c17 oOOO.O Paaa+02",
+                    "Target Pipeline": {
+                        "description": "Preprocessing Pipeline for Target Observation, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "_Triggered_Observation_Name_/TP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 8
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
+                                "frequency_steps": 4,
+                                "time_steps": 1
                             },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target3": {
-                        "description": "Preprocessing Pipeline for Target Observation target3",
-                        "short_description": "c17 oOOO.O Paaa+03",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 122,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
+                                "rfi_strategy": "HBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -52330,27 +62940,27 @@
                     }
                 }
             },
-            "version": 30,
-            "id": 52,
-            "state_value": "legacy",
-            "purpose_value": "production"
+            "version": 28,
+            "id": 64,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA High Survey and LBA Co-observing.",
-            "name": "IM LBA Survey - 3 Beams",
+            "description": "This observation strategy template defines a fast response template run with a 7 bams Target-Calibrator observation chain, plus a preprocessing pipeline for each target beam and calibrator and ingest of pipeline data only.",
+            "name": "IM RT HBA - 7 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -52360,163 +62970,421 @@
                         ]
                     },
                     {
-                        "name": "Duration",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/duration"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Run ADDER QA",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Observation description",
+                        "name": "Target Pointing 1",
                         "refs": [
-                            "#/tasks/Combined Observation/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline 1 description",
+                        "name": "Target Pointing 2",
                         "refs": [
-                            "#/tasks/Pipeline target1/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline 2 description",
+                        "name": "Target Pointing 3",
                         "refs": [
-                            "#/tasks/Pipeline target2/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline 3 description",
+                        "name": "Target Pointing 4",
                         "refs": [
-                            "#/tasks/Pipeline target3/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Pipeline Calibrator description",
+                        "name": "Target Pointing 5",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/short_description"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pointing 1",
+                        "name": "Target Pointing 6",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/5/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pointing 2",
+                        "name": "Target Pointing 7",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/6/digital_pointing"
                         ]
                     },
                     {
-                        "name": "Target Pointing 3",
+                        "name": "Tile Beam",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
                     {
-                        "name": "Calibrator Pointing",
+                        "name": "Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Time averaging steps",
+                        "name": "Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
-                            "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
-                        "name": "Frequency averaging steps",
+                        "name": "Pipeline 3 Description",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
-                            "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
-                            "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+                            "#/tasks/Pipeline target3/short_description"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 1",
+                        "name": "Pipeline 4 Description",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target4/short_description"
                         ]
                     },
                     {
-                        "name": "Demix ignore target Pipeline Target 1",
+                        "name": "Pipeline 5 Description",
                         "refs": [
-                            "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+                            "#/tasks/Pipeline target5/short_description"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 2",
+                        "name": "Pipeline 6 Description",
                         "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+                            "#/tasks/Pipeline target6/short_description"
                         ]
                     },
                     {
-                        "name": "Demix ignore target Pipeline Target 2",
+                        "name": "Pipeline 7 Description",
                         "refs": [
-                            "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+                            "#/tasks/Pipeline target7/short_description"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Target 3",
+                        "name": "Calibrator Observation Description",
                         "refs": [
-                            "#/tasks/Pipeline target3/specifications_doc/demix/sources"
+                            "#/tasks/Calibrator Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Demix ignore target Pipeline Target 3",
+                        "name": "Calibrator Observation Pointing",
                         "refs": [
-                            "#/tasks/Pipeline target3/specifications_doc/demix/ignore_target"
+                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
                         ]
                     },
                     {
-                        "name": "Demix sources Pipeline Calibrator",
+                        "name": "Calibrator Pipeline Description",
                         "refs": [
-                            "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+                            "#/tasks/Calibrator Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
                         ]
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "daily": {
-                        "avoid_twilight": false,
-                        "require_day": false,
-                        "require_night": false
+                    "scheduler": "fixed_time",
+                    "sky": {
+                        "min_distance": {
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0,
+                                "sun": 0
+                            }
+                        },
+                        "min_elevation": {
+                            "calibrator": 0.1745329252,
+                            "target": 0.1745329252
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
+                        }
+                    },
+                    "time": {
+                        "at": "2023-05-04T12:40:00"
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 11
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Calibrator Pipeline",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Calibrator Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target1",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap1"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target2",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap2"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target3",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap3"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target4",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap4"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target5",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap5"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target6",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap6"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Pipeline target7",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {
+                            "sap": [
+                                "sap7"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Calibrator Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline target2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
                     },
-                    "scheduler": "dynamic",
-                    "sky": {
-                        "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.52359877559,
-                            "sun": 0.52359877559
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "min_elevation": {
-                            "calibrator": 0.52359877559,
-                            "target": 0.87266462599
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
-                        "transit_offset": {
-                            "from": -14400,
-                            "to": 14400
+                        "producer": "Pipeline target3",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
                         }
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
+                    },
                     {
-                        "consumer": "Calibrator Pipeline",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52525,21 +63393,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "calibrator"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target4",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target1",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52548,21 +63412,17 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target1"
-                            ]
+                            "role": "any"
                         },
+                        "producer": "Pipeline target5",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target2",
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52571,21 +63431,36 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target2"
-                            ]
+                        "producer": "Pipeline target6",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
                         },
+                        "producer": "Pipeline target7",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Pipeline target3",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52596,19 +63471,15 @@
                             "datatype": "visibilities",
                             "role": "correlator"
                         },
-                        "producer": "Combined Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "target3"
-                            ]
-                        },
+                        "producer": "Target Observation",
+                        "selection_doc": {},
                         "selection_template": {
-                            "name": "SAP",
+                            "name": "all",
                             "version": 6
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52617,9 +63488,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Calibrator Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -52627,7 +63498,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52646,7 +63517,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52665,7 +63536,7 @@
                         }
                     },
                     {
-                        "consumer": "Ingest",
+                        "consumer": "Cleanup",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
@@ -52693,9 +63564,9 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "correlator"
+                            "role": "any"
                         },
-                        "producer": "Combined Observation",
+                        "producer": "Pipeline target4",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -52714,7 +63585,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target1",
+                        "producer": "Pipeline target5",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -52733,7 +63604,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target2",
+                        "producer": "Pipeline target6",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -52752,7 +63623,7 @@
                             "datatype": "visibilities",
                             "role": "any"
                         },
-                        "producer": "Pipeline target3",
+                        "producer": "Pipeline target7",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
@@ -52779,26 +63650,75 @@
                         }
                     }
                 ],
-                "task_scheduling_relations": [],
+                "task_scheduling_relations": [
+                    {
+                        "first": "Calibrator Observation",
+                        "placement": "after",
+                        "second": "Target Observation",
+                        "time_offset": 60
+                    }
+                ],
                 "tasks": {
+                    "Calibrator Observation": {
+                        "description": "Calibrator Observation. After the Target Observation",
+                        "short_description": "Cal 3Cdef",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator1",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "3Cdef"
+                                }
+                            },
+                            "duration": 600
+                        },
+                        "specifications_template": {
+                            "name": "calibrator observation",
+                            "version": 8
+                        }
+                    },
                     "Calibrator Pipeline": {
                         "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "c17 oOOO.O 3Cabc",
+                        "short_description": "Cal 3Cdef/PP",
                         "specifications_doc": {
                             "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 61,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
                             },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
                                 "sources": [],
-                                "time_steps": 8
+                                "time_steps": 10
                             },
                             "flag": {
                                 "autocorrelations": true,
                                 "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
+                                "rfi_strategy": "HBAdefault"
                             },
                             "storagemanager": "dysco"
                         },
@@ -52815,13 +63735,259 @@
                             "version": 7
                         }
                     },
-                    "Combined Observation": {
-                        "description": "Combined parallel Calibrator & Target Observation for LBA with 3 target beams",
-                        "short_description": "OOO.O Paaa+01 Paaa+02 Paaa+03",
+                    "Ingest": {
+                        "description": "Ingest all preprocessed dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "Pipeline target1": {
+                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC1/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC2/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target3": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC3/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target4": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC4/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target5": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC5/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target6": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC6/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Pipeline target7": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "RADEC7/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 4,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 69,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "demix": {
+                                "frequency_steps": 64,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
+                            },
+                            "flag": {
+                                "autocorrelations": true,
+                                "outerchannels": true,
+                                "rfi_strategy": "HBAdefault"
+                            },
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 8
+                        }
+                    },
+                    "Target Observation": {
+                        "description": "Target Observation for fast response scheduling unit (7 beams). HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+                        "short_description": "RADEC1, RADEC2, RADEC3, RADEC4, RADEC5, RADEC6, RADEC7",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
-                                    "enabled": true,
+                                    "enabled": false,
                                     "nr_of_subbands": -1,
                                     "nr_of_timestamps": 256
                                 },
@@ -52829,17 +63995,7 @@
                                 "plots": {
                                     "autocorrelation": true,
                                     "crosscorrelation": true,
-                                    "enabled": true
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cabc"
+                                    "enabled": false
                                 }
                             },
                             "correlator": {
@@ -52847,7 +64003,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 120,
+                            "duration": 300,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -52855,10 +64011,115 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+01"
+                                            "target": "RADEC1"
+                                        },
+                                        "name": "sap1",
+                                        "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "RADEC2"
                                         },
-                                        "name": "target1",
+                                        "name": "sap2",
                                         "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
                                             217,
                                             218,
                                             219,
@@ -52902,85 +64163,7 @@
                                             257,
                                             258,
                                             259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            260
                                         ]
                                     },
                                     {
@@ -52988,10 +64171,35 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+02"
+                                            "target": "RADEC3"
                                         },
-                                        "name": "target2",
+                                        "name": "sap3",
                                         "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
                                             217,
                                             218,
                                             219,
@@ -53035,85 +64243,7 @@
                                             257,
                                             258,
                                             259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            260
                                         ]
                                     },
                                     {
@@ -53121,10 +64251,275 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+03"
+                                            "target": "RADEC4"
                                         },
-                                        "name": "target3",
+                                        "name": "sap4",
+                                        "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "RADEC5"
+                                        },
+                                        "name": "sap5",
+                                        "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "RADEC6"
+                                        },
+                                        "name": "sap6",
+                                        "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "RADEC7"
+                                        },
+                                        "name": "sap7",
                                         "subbands": [
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
                                             217,
                                             218,
                                             219,
@@ -53168,93 +64563,15 @@
                                             257,
                                             258,
                                             259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            301,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            329,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338
+                                            260
                                         ]
                                     }
                                 ],
-                                "antenna_set": "LBA_SPARSE_EVEN",
-                                "filter": "LBA_30_90",
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 4,
+                                        "max_nr_missing": 6,
                                         "stations": [
                                             "CS002",
                                             "CS003",
@@ -53271,7 +64588,6 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
-                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -53294,125 +64610,31 @@
                                             "RS508",
                                             "RS509"
                                         ]
-                                    },
-                                    {
-                                        "max_nr_missing": 1,
-                                        "stations": [
-                                            "RS508",
-                                            "RS509"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 0,
-                                        "stations": [
-                                            "RS310",
-                                            "RS210"
-                                        ]
                                     }
-                                ]
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "RADEC1RADEC2RADEC3RADEC4RADEC5RADEC6RADEC7REF"
+                                }
                             }
                         },
                         "specifications_template": {
-                            "name": "parallel calibrator target observation",
-                            "version": 10
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
+                            "name": "target observation",
                             "version": 7
                         }
-                    },
-                    "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1",
-                        "short_description": "c17 oOOO.O Paaa+01",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 8
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2",
-                        "short_description": "c17 oOOO.O Paaa+02",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 8
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target3": {
-                        "description": "Preprocessing Pipeline for Target Observation target3",
-                        "short_description": "c17 oOOO.O Paaa+03",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 8,
-                                "time_steps": 4
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 8
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "LBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
                     }
                 }
             },
-            "version": 38,
-            "id": 53,
+            "version": 3,
+            "id": 65,
             "state_value": "active",
             "purpose_value": "production"
         },
         {
             "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
-            "name": "IM RT HBA - 1 beam",
+            "name": "IM RT HBA LoTSS",
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
@@ -53422,12 +64644,6 @@
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
                 "parameters": [
-                    {
-                        "name": "Stations",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
-                        ]
-                    },
                     {
                         "name": "Scheduling Constraints",
                         "refs": [
@@ -53500,30 +64716,19 @@
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "scheduler": "fixed_time",
+                    "scheduler": "dynamic",
                     "sky": {
-                        "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0.008726646259971648,
-                            "sun": 0.008726646259971648
-                        },
-                        "min_elevation": {
-                            "calibrator": 0.3490658503988659,
-                            "target": 0.3490658503988659
-                        },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -86400,
+                            "to": 86400
                         }
                     },
                     "time": {
-                        "at": "2023-05-04T12:40:00",
                         "between": []
                     }
                 },
                 "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
+                    "name": "constraints"
                 },
                 "task_relations": [
                     {
@@ -53546,7 +64751,7 @@
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 6
+                            "version": 7
                         }
                     },
                     {
@@ -53565,7 +64770,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     {
@@ -53584,7 +64789,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     {
@@ -53603,7 +64808,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     {
@@ -53622,7 +64827,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     {
@@ -53641,7 +64846,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     {
@@ -53660,7 +64865,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     {
@@ -53679,7 +64884,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 8
                         }
                     }
                 ],
@@ -53723,7 +64928,7 @@
                         },
                         "specifications_template": {
                             "name": "calibrator observation",
-                            "version": 8
+                            "version": 9
                         }
                     },
                     "Calibrator Pipeline": {
@@ -53734,14 +64939,6 @@
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -54062,6 +65259,7 @@
                                     {
                                         "max_nr_missing": 4,
                                         "stations": [
+                                            "CS001",
                                             "CS002",
                                             "CS003",
                                             "CS004",
@@ -54077,6 +65275,7 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
+                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -54122,14 +65321,6 @@
                                 "frequency_steps": 4,
                                 "time_steps": 1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 122,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
                             "demix": {
                                 "frequency_steps": 64,
                                 "ignore_target": false,
@@ -54150,22 +65341,22 @@
                     }
                 }
             },
-            "version": 28,
-            "id": 54,
+            "version": 27,
+            "id": 66,
             "state_value": "development",
             "purpose_value": "technical_commissioning"
         },
         {
-            "description": "This observation strategy template defines a fast response template run with a 7 bams Target-Calibrator observation chain, plus a preprocessing pipeline for each target beam and calibrator and ingest of pipeline data only.",
-            "name": "IM RT HBA - 7 Beams",
+            "description": "This observation strategy template defines a LoTSS (Co-)observing run for short observations or RT mode with a Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+            "name": "IM RT HBA LoTSS - 2 Beams",
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 7
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/7/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations",
@@ -54179,18 +65370,6 @@
                             "#/scheduling_constraints_doc"
                         ]
                     },
-                    {
-                        "name": "Observation Description",
-                        "refs": [
-                            "#/tasks/Target Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Target Duration",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
-                        ]
-                    },
                     {
                         "name": "Target Pointing 1",
                         "refs": [
@@ -54203,36 +65382,6 @@
                             "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
                         ]
                     },
-                    {
-                        "name": "Target Pointing 3",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 4",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 5",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 6",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/5/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 7",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/6/digital_pointing"
-                        ]
-                    },
                     {
                         "name": "Tile Beam",
                         "refs": [
@@ -54240,45 +65389,27 @@
                         ]
                     },
                     {
-                        "name": "Pipeline 1 Description",
-                        "refs": [
-                            "#/tasks/Pipeline target1/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 2 Description",
-                        "refs": [
-                            "#/tasks/Pipeline target2/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 3 Description",
-                        "refs": [
-                            "#/tasks/Pipeline target3/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 4 Description",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Pipeline target4/short_description"
+                            "#/tasks/Target Observation/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Pipeline 5 Description",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Pipeline target5/short_description"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 6 Description",
+                        "name": "Pipeline 1 Description",
                         "refs": [
-                            "#/tasks/Pipeline target6/short_description"
+                            "#/tasks/Pipeline target1/short_description"
                         ]
                     },
                     {
-                        "name": "Pipeline 7 Description",
+                        "name": "Pipeline 2 Description",
                         "refs": [
-                            "#/tasks/Pipeline target7/short_description"
+                            "#/tasks/Pipeline target2/short_description"
                         ]
                     },
                     {
@@ -54310,29 +65441,28 @@
                     }
                 ],
                 "scheduling_constraints_doc": {
-                    "scheduler": "fixed_time",
+                    "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
+                            "target": {
+                                "jupiter": 0.26179938779,
+                                "moon": 0.5235987755982988,
+                                "sun": 0.5235987755982988
+                            }
                         },
                         "min_elevation": {
-                            "calibrator": 0.1745329252,
-                            "target": 0.1745329252
+                            "calibrator": 0.5235987755982988,
+                            "target": 0.5235987755982988
                         },
                         "transit_offset": {
-                            "from": -43200,
-                            "to": 43200
+                            "from": -1440,
+                            "to": 1440
                         }
-                    },
-                    "time": {
-                        "at": "2023-05-04T12:40:00"
                     }
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -54400,121 +65530,6 @@
                             "version": 6
                         }
                     },
-                    {
-                        "consumer": "Pipeline target3",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap3"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target4",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap4"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target5",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap5"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target6",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap6"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target7",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap7"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
                     {
                         "consumer": "Ingest",
                         "input": {
@@ -54572,101 +65587,6 @@
                             "version": 6
                         }
                     },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target3",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target4",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target5",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target6",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target7",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -54743,101 +65663,6 @@
                             "version": 6
                         }
                     },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target3",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target4",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target5",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target6",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target7",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -54886,7 +65711,7 @@
                             },
                             "calibrator": {
                                 "autoselect": false,
-                                "name": "calibrator1",
+                                "name": "calibrator",
                                 "pointing": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
@@ -54952,178 +65777,8 @@
                         }
                     },
                     "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC1/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 69,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC2/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 69,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target3": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC3/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 69,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target4": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC4/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 69,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target5": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC5/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 69,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target6": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC6/TP",
+                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+01/TP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
@@ -55131,7 +65786,7 @@
                             },
                             "cluster_resources": {
                                 "cores_per_task": 2,
-                                "parallel_tasks": 69,
+                                "parallel_tasks": 61,
                                 "where": {
                                     "cluster": "CEP4",
                                     "partition": "cpu"
@@ -55155,9 +65810,9 @@
                             "version": 8
                         }
                     },
-                    "Pipeline target7": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP002, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "RADEC7/TP",
+                    "Pipeline target2": {
+                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
+                        "short_description": "Paaa+02/TP",
                         "specifications_doc": {
                             "average": {
                                 "frequency_steps": 4,
@@ -55165,7 +65820,7 @@
                             },
                             "cluster_resources": {
                                 "cores_per_task": 2,
-                                "parallel_tasks": 69,
+                                "parallel_tasks": 61,
                                 "where": {
                                     "cluster": "CEP4",
                                     "partition": "cpu"
@@ -55190,8 +65845,8 @@
                         }
                     },
                     "Target Observation": {
-                        "description": "Target Observation for fast response scheduling unit (7 beams). HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
-                        "short_description": "RADEC1, RADEC2, RADEC3, RADEC4, RADEC5, RADEC6, RADEC7",
+                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+                        "short_description": "Paaa+01 & Paaa+02",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -55211,7 +65866,7 @@
                                 "integration_time": 1,
                                 "storage_cluster": "CEP4"
                             },
-                            "duration": 300,
+                            "duration": 28800,
                             "station_configuration": {
                                 "SAPs": [
                                     {
@@ -55219,10 +65874,93 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "RADEC1"
+                                            "target": "Paaa+01"
                                         },
                                         "name": "sap1",
                                         "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
                                             192,
                                             193,
                                             194,
@@ -55241,411 +65979,8 @@
                                             207,
                                             208,
                                             209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "RADEC2"
-                                        },
-                                        "name": "sap2",
-                                        "subbands": [
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "RADEC3"
-                                        },
-                                        "name": "sap3",
-                                        "subbands": [
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "RADEC4"
-                                        },
-                                        "name": "sap4",
-                                        "subbands": [
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "RADEC5"
-                                        },
-                                        "name": "sap5",
-                                        "subbands": [
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "RADEC6"
-                                        },
-                                        "name": "sap6",
-                                        "subbands": [
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
-                                            211,
                                             212,
                                             213,
-                                            214,
                                             215,
                                             216,
                                             217,
@@ -55672,7 +66007,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -55687,11 +66021,106 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
-                                            260
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     },
                                     {
@@ -55699,10 +66128,93 @@
                                             "angle1": 0.6624317181687094,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "RADEC7"
+                                            "target": "Paaa+02"
                                         },
-                                        "name": "sap7",
+                                        "name": "sap2",
                                         "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
                                             192,
                                             193,
                                             194,
@@ -55721,11 +66233,8 @@
                                             207,
                                             208,
                                             209,
-                                            210,
-                                            211,
                                             212,
                                             213,
-                                            214,
                                             215,
                                             216,
                                             217,
@@ -55752,7 +66261,6 @@
                                             238,
                                             239,
                                             240,
-                                            241,
                                             242,
                                             243,
                                             244,
@@ -55767,11 +66275,106 @@
                                             253,
                                             254,
                                             255,
-                                            256,
                                             257,
                                             258,
                                             259,
-                                            260
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
                                         ]
                                     }
                                 ],
@@ -55779,7 +66382,7 @@
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 6,
+                                        "max_nr_missing": 4,
                                         "stations": [
                                             "CS002",
                                             "CS003",
@@ -55796,6 +66399,7 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
+                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
@@ -55818,56 +66422,82 @@
                                             "RS508",
                                             "RS509"
                                         ]
+                                    },
+                                    {
+                                        "max_nr_missing": 2,
+                                        "stations": [
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    },
+                                    {
+                                        "max_nr_missing": 1,
+                                        "stations": [
+                                            "DE601",
+                                            "DE605"
+                                        ]
                                     }
                                 ],
                                 "tile_beam": {
                                     "angle1": 0.6624317181687094,
                                     "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "RADEC1RADEC2RADEC3RADEC4RADEC5RADEC6RADEC7REF"
+                                    "target": "Paaa+01Paaa+02REF"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "target observation",
-                            "version": 7
+                            "version": 9
                         }
                     }
                 }
             },
-            "version": 3,
-            "id": 55,
+            "version": 1,
+            "id": 67,
             "state_value": "active",
             "purpose_value": "production"
         },
         {
-            "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
-            "name": "IM RT HBA LoTSS",
+            "description": "lofar2 test observation - IM HBA 1 beam",
+            "name": "Lofar2 IM HBA 1 beam",
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 8
             },
             "state": "development",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
-                        "name": "Scheduling Constraints",
+                        "name": "Stations",
                         "refs": [
-                            "#/scheduling_constraints_doc"
+                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Scheduling Constraints",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/scheduling_constraints_doc"
                         ]
                     },
                     {
-                        "name": "Pipeline Description",
+                        "name": "Observation Description",
                         "refs": [
-                            "#/tasks/Target Pipeline/short_description"
+                            "#/tasks/Target Observation/short_description"
                         ]
                     },
                     {
@@ -55877,12 +66507,6 @@
                             "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
                         ]
                     },
-                    {
-                        "name": "Target Duration",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
-                        ]
-                    },
                     {
                         "name": "Subbands",
                         "refs": [
@@ -55890,192 +66514,55 @@
                         ]
                     },
                     {
-                        "name": "Calibrator Observation Description",
-                        "refs": [
-                            "#/tasks/Calibrator Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Pipeline Description",
-                        "refs": [
-                            "#/tasks/Calibrator Pipeline/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation Pointing",
-                        "refs": [
-                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Duration",
-                        "refs": [
-                            "#/tasks/Calibrator Observation/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Run ADDER",
+                        "name": "Target Duration",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled"
-                        ]
-                    }
-                ],
-                "scheduling_constraints_doc": {
-                    "scheduler": "dynamic",
-                    "sky": {
-                        "transit_offset": {
-                            "from": -86400,
-                            "to": 86400
-                        }
-                    },
-                    "time": {
-                        "between": []
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints"
-                },
-                "task_relations": [
-                    {
-                        "consumer": "Target Pipeline",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap1"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 7
-                        }
-                    },
-                    {
-                        "consumer": "Calibrator Pipeline",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 8
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Target Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 8
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 8
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 8
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Target Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 8
-                        }
+                            "#/tasks/Target Observation/specifications_doc/duration"
+                        ]
                     },
                     {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
+                        "name": "Run Adder",
+                        "refs": [
+                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
+                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "daily": {
+                        "avoid_twilight": false,
+                        "require_day": false,
+                        "require_night": false
+                    },
+                    "location": "center",
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0,
+                            "sun": 0
                         },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
+                        "min_elevation": {
+                            "calibrator": 0.05235987755982988,
+                            "target": 0.05235987755982988
                         },
-                        "producer": "Calibrator Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 8
+                        "reference_pointing": {
+                            "enabled": false
+                        },
+                        "transit_offset": {
+                            "from": -43200,
+                            "to": 43200
                         }
                     },
+                    "time": {
+                        "between": [],
+                        "not_between": []
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 7
+                },
+                "task_relations": [
                     {
                         "consumer": "Cleanup",
                         "input": {
@@ -56086,104 +66573,30 @@
                         "output": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
-                            "role": "any"
+                            "role": "correlator"
                         },
-                        "producer": "Calibrator Pipeline",
+                        "producer": "Target Observation",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 8
+                            "version": 6
                         }
                     }
                 ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    }
-                ],
+                "task_scheduling_relations": [],
                 "tasks": {
-                    "Calibrator Observation": {
-                        "description": "Calibrator Observation. After the Target Observation",
-                        "short_description": "_Calibrator_Name_",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 9
-                        }
-                    },
-                    "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "_Calibrator_Name_/CP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
                     "Cleanup": {
                         "description": "Clean up all dataproducts from disk after ingest",
+                        "short_description": "",
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
                             "version": 7
                         }
                     },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
                     "Target Observation": {
-                        "description": "Target Observation for Responsive Telescope scheduling unit. NL stations, HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
-                        "short_description": "_Triggered_Observation_Name_",
+                        "description": "Target Observation",
+                        "short_description": "_Target_Name_",
                         "specifications_doc": {
                             "QA": {
                                 "file_conversion": {
@@ -56201,19 +66614,20 @@
                             "correlator": {
                                 "channels_per_subband": 64,
                                 "integration_time": 1,
-                                "storage_cluster": "CEP4"
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
                             },
-                            "duration": 7200,
+                            "duration": 60,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
+                                            "angle1": 3.280425596160204,
                                             "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "_Triggered_Target_"
+                                            "target": "target1"
                                         },
-                                        "name": "sap1",
+                                        "name": "target",
                                         "subbands": [
                                             104,
                                             105,
@@ -56461,883 +66875,1945 @@
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
+                                "antenna_set": "HBA_ZERO",
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 4,
-                                        "stations": [
-                                            "CS001",
-                                            "CS002",
-                                            "CS003",
-                                            "CS004",
-                                            "CS005",
-                                            "CS006",
-                                            "CS007",
-                                            "CS011",
-                                            "CS013",
-                                            "CS017",
-                                            "CS021",
-                                            "CS024",
-                                            "CS026",
-                                            "CS028",
-                                            "CS030",
-                                            "CS031",
-                                            "CS032",
-                                            "CS101",
-                                            "CS103",
-                                            "CS201",
-                                            "CS301",
-                                            "CS302",
-                                            "CS401",
-                                            "CS501",
-                                            "RS106",
-                                            "RS205",
-                                            "RS208",
-                                            "RS210",
-                                            "RS305",
-                                            "RS306",
-                                            "RS307",
-                                            "RS310",
-                                            "RS406",
-                                            "RS407",
-                                            "RS409",
-                                            "RS503",
-                                            "RS508",
-                                            "RS509"
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS001"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 3.280425596160204,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "target1"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "target observation",
+                            "version": 9
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 68,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
+        },
+        {
+            "description": "A custom strategy to observe an FRB target preceeded by a 5min pulsar",
+            "name": "PT+FRB",
+            "purpose": "technical_commissioning",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 6
+            },
+            "state": "development",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/6/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations (PT & FRB observation)",
+                        "refs": [
+                            "#/tasks/FRB Observation/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/PT Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints (PT & FRB observation)",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "FRB Duration",
+                        "refs": [
+                            "#/tasks/FRB Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "FRB Observation Short Description",
+                        "refs": [
+                            "#/tasks/FRB Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "FRB Pipeline Short Description",
+                        "refs": [
+                            "#/tasks/FRB Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "FRB Target Pointing",
+                        "refs": [
+                            "#/tasks/FRB Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/FRB Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "PT Duration",
+                        "refs": [
+                            "#/tasks/PT Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "PT Observation Short Description",
+                        "refs": [
+                            "#/tasks/PT Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "PT Pipeline Short Description",
+                        "refs": [
+                            "#/tasks/PT Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "PT Target Pointing",
+                        "refs": [
+                            "#/tasks/PT Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/PT Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "PT Pipeline Optimise period & DM",
+                        "refs": [
+                            "#/tasks/PT Pipeline/specifications_doc/dspsr/optimise_period_dm"
+                        ]
+                    },
+                    {
+                        "name": "PT Pipeline Subintegration time",
+                        "refs": [
+                            "#/tasks/PT Pipeline/specifications_doc/dspsr/subintegration_length"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "jupiter": 0,
+                            "moon": 0.00872665,
+                            "sun": 0.00872665
+                        },
+                        "min_elevation": {
+                            "target": 0.5235988
+                        },
+                        "transit_offset": {
+                            "from": -7200,
+                            "to": 7200
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 6
+                },
+                "task_relations": [
+                    {
+                        "consumer": "FRB Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "FRB Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "FRB Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "FRB Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "FRB Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "FRB Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "FRB Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "PT Pipeline",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "PT Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "PT Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "PT Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "PT Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp summary",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "producer": "PT Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "pulp analysis",
+                            "datatype": "pulsar profile",
+                            "role": "any"
+                        },
+                        "producer": "PT Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 6
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [
+                    {
+                        "first": "PT Observation",
+                        "placement": "before",
+                        "second": "FRB Observation",
+                        "time_offset": 60
+                    }
+                ],
+                "tasks": {
+                    "Cleanup": {
+                        "description": "Cleanup all dataproducts from disk",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "FRB Observation": {
+                        "description": "Beamforming CV FRB observation",
+                        "short_description": "FRByyyymmdd",
+                        "specifications_doc": {
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP0",
+                                                    "subbands": {
+                                                        "list": [
+                                                            51,
+                                                            52,
+                                                            53,
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "Beamformer CV",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 4,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS032",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
                                         ]
                                     }
                                 ],
-                                "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "_Triggered_Target_"
-                                }
-                            }
-                        },
-                        "specifications_template": {
-                            "name": "target observation",
-                            "version": 9
-                        }
-                    },
-                    "Target Pipeline": {
-                        "description": "Preprocessing Pipeline for Target Observation, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "_Triggered_Observation_Name_/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    }
-                }
-            },
-            "version": 27,
-            "id": 56,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
-        },
-        {
-            "description": "This observation strategy template defines a LoTSS (Co-)observing run for short observations or RT mode with a Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
-            "name": "IM RT HBA LoTSS - 2 Beams",
-            "purpose": "production",
-            "scheduling_unit_template": {
-                "name": "scheduling unit",
-                "version": 8
-            },
-            "state": "active",
-            "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
-                "parameters": [
-                    {
-                        "name": "Stations",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
-                        ]
-                    },
-                    {
-                        "name": "Scheduling Constraints",
-                        "refs": [
-                            "#/scheduling_constraints_doc"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 1",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Target Pointing 2",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
-                        ]
-                    },
-                    {
-                        "name": "Tile Beam",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
-                        ]
-                    },
-                    {
-                        "name": "Target Duration",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "Observation Description",
-                        "refs": [
-                            "#/tasks/Target Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 1 Description",
-                        "refs": [
-                            "#/tasks/Pipeline target1/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Pipeline 2 Description",
-                        "refs": [
-                            "#/tasks/Pipeline target2/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation Description",
-                        "refs": [
-                            "#/tasks/Calibrator Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Observation Pointing",
-                        "refs": [
-                            "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
-                        ]
-                    },
-                    {
-                        "name": "Calibrator Pipeline Description",
-                        "refs": [
-                            "#/tasks/Calibrator Pipeline/short_description"
-                        ]
-                    },
-                    {
-                        "name": "Run Adder",
-                        "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
-                            "#/tasks/Calibrator Observation/specifications_doc/QA/file_conversion/enabled"
-                        ]
-                    }
-                ],
-                "scheduling_constraints_doc": {
-                    "scheduler": "dynamic",
-                    "sky": {
-                        "min_distance": {
-                            "jupiter": 0.26179938779,
-                            "moon": 0.5235987755982988,
-                            "sun": 0.5235987755982988
-                        },
-                        "min_elevation": {
-                            "calibrator": 0.5235987755982988,
-                            "target": 0.5235987755982988
-                        },
-                        "transit_offset": {
-                            "from": -1440,
-                            "to": 1440
-                        }
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 7
-                },
-                "task_relations": [
-                    {
-                        "consumer": "Calibrator Pipeline",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target1",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap1"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Pipeline target2",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {
-                            "sap": [
-                                "sap2"
-                            ]
-                        },
-                        "selection_template": {
-                            "name": "SAP",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Target Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
-                        },
-                        "producer": "Calibrator Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target1",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Pipeline target2",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "any"
-                        },
-                        "producer": "Calibrator Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "Calibrator Observation",
-                        "placement": "after",
-                        "second": "Target Observation",
-                        "time_offset": 60
-                    }
-                ],
-                "tasks": {
-                    "Calibrator Observation": {
-                        "description": "Calibrator Observation. After the Target Observation",
-                        "short_description": "Cal 3Cdef",
-                        "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
+                                "ppf": false
                             },
-                            "calibrator": {
-                                "autoselect": false,
-                                "name": "calibrator",
-                                "pointing": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
+                            "duration": 3600,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.92934186635,
+                                            "angle2": 0.952579228492,
+                                            "direction_type": "J2000",
+                                            "target": "Baaaa+bb"
+                                        },
+                                        "name": "SAP0",
+                                        "subbands": [
+                                            51,
+                                            52,
+                                            53,
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL_INNER",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 4,
+                                        "stations": [
+                                            "CS002",
+                                            "CS003",
+                                            "CS004",
+                                            "CS005",
+                                            "CS006",
+                                            "CS007",
+                                            "CS011",
+                                            "CS013",
+                                            "CS017",
+                                            "CS021",
+                                            "CS024",
+                                            "CS026",
+                                            "CS028",
+                                            "CS030",
+                                            "CS031",
+                                            "CS032",
+                                            "CS101",
+                                            "CS103",
+                                            "CS201",
+                                            "CS301",
+                                            "CS302",
+                                            "CS401",
+                                            "CS501"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.92934186635,
+                                    "angle2": 0.952579228492,
                                     "direction_type": "J2000",
-                                    "target": "3Cdef"
-                                }
-                            },
-                            "duration": 600
-                        },
-                        "specifications_template": {
-                            "name": "calibrator observation",
-                            "version": 8
-                        }
-                    },
-                    "Calibrator Pipeline": {
-                        "description": "Preprocessing Pipeline for Calibrator Observation",
-                        "short_description": "Cal 3Cdef/PP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
+                                    "target": "Baaaa+bb"
                                 }
-                            },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
+                            }
                         },
                         "specifications_template": {
-                            "name": "preprocessing pipeline",
+                            "name": "beamforming observation",
                             "version": 8
                         }
                     },
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
-                    },
-                    "Ingest": {
-                        "description": "Ingest all preprocessed dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "Pipeline target1": {
-                        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+01/TP",
+                    "FRB Pipeline": {
+                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
+                        "short_description": "Baaaa+bb/PULP",
                         "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
-                            },
                             "cluster_resources": {
                                 "cores_per_task": 2,
-                                "parallel_tasks": 61,
+                                "parallel_tasks": 20,
                                 "where": {
                                     "cluster": "CEP4",
                                     "partition": "cpu"
                                 }
                             },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
-                            },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
-                            },
-                            "storagemanager": "dysco"
-                        },
-                        "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
-                        }
-                    },
-                    "Pipeline target2": {
-                        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
-                        "short_description": "Paaa+02/TP",
-                        "specifications_doc": {
-                            "average": {
-                                "frequency_steps": 4,
-                                "time_steps": 1
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": false,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": -1
                             },
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 61,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": true,
+                                    "scale": 5
                                 }
                             },
-                            "demix": {
-                                "frequency_steps": 64,
-                                "ignore_target": false,
-                                "sources": [],
-                                "time_steps": 10
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
                             },
-                            "flag": {
-                                "autocorrelations": true,
-                                "outerchannels": true,
-                                "rfi_strategy": "HBAdefault"
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
                             },
-                            "storagemanager": "dysco"
+                            "single_pulse_search": false
                         },
                         "specifications_template": {
-                            "name": "preprocessing pipeline",
-                            "version": 8
+                            "name": "pulsar pipeline",
+                            "version": 6
                         }
                     },
-                    "Target Observation": {
-                        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
-                        "short_description": "Paaa+01 & Paaa+02",
+                    "Ingest": {
+                        "description": "Ingest the pipeline outputs dataproducts",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 7
+                        }
+                    },
+                    "PT Observation": {
+                        "description": "Beamforming observation for default pulsar timing with HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400",
+                        "short_description": "Baaaa+bb",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4"
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP0",
+                                                    "subbands": {
+                                                        "list": [
+                                                            51,
+                                                            52,
+                                                            53,
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "J2000",
+                                                                "target": "OnTarget"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "XXYY",
+                                                "subbands_per_file": 20,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "Beamformer CV",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 4,
+                                                "stations": [
+                                                    "CS002",
+                                                    "CS003",
+                                                    "CS004",
+                                                    "CS005",
+                                                    "CS006",
+                                                    "CS007",
+                                                    "CS011",
+                                                    "CS013",
+                                                    "CS017",
+                                                    "CS021",
+                                                    "CS024",
+                                                    "CS026",
+                                                    "CS028",
+                                                    "CS030",
+                                                    "CS031",
+                                                    "CS032",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
+                                                    "CS301",
+                                                    "CS302",
+                                                    "CS401",
+                                                    "CS501"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
                             },
-                            "duration": 28800,
+                            "duration": 300,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "Paaa+01"
-                                        },
-                                        "name": "sap1",
-                                        "subbands": [
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
-                                            117,
-                                            118,
-                                            119,
-                                            120,
-                                            121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
-                                            126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
-                                            131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
-                                            136,
-                                            138,
-                                            139,
-                                            140,
-                                            141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
-                                            146,
-                                            147,
-                                            148,
-                                            149,
-                                            150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
-                                            156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
-                                            161,
-                                            162,
-                                            163,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
-                                            172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
-                                            178,
-                                            179,
-                                            180,
-                                            182,
-                                            183,
-                                            184,
-                                            187,
-                                            188,
-                                            189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
-                                            194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
-                                            201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
-                                            206,
-                                            207,
-                                            208,
-                                            209,
-                                            212,
-                                            213,
-                                            215,
-                                            216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
-                                            221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
-                                            232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
-                                            237,
-                                            238,
-                                            239,
-                                            240,
-                                            242,
-                                            243,
-                                            244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
-                                            249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
-                                            255,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
-                                            263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
-                                            269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
-                                            279,
-                                            280,
-                                            281,
-                                            282,
-                                            283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
-                                            295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
-                                            300,
-                                            302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
-                                            312,
-                                            313,
-                                            314,
-                                            315,
-                                            316,
-                                            317,
-                                            318,
-                                            319,
-                                            320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
-                                            328,
-                                            330,
-                                            331,
-                                            332,
-                                            333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
-                                            338,
-                                            339,
-                                            340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
-                                        ]
-                                    },
-                                    {
-                                        "digital_pointing": {
-                                            "angle1": 0.6624317181687094,
-                                            "angle2": 1.5579526427549426,
+                                            "angle1": 0.92934186635,
+                                            "angle2": 0.952579228492,
                                             "direction_type": "J2000",
-                                            "target": "Paaa+02"
+                                            "target": "Baaaa+bb"
                                         },
-                                        "name": "sap2",
+                                        "name": "SAP0",
                                         "subbands": [
+                                            51,
+                                            52,
+                                            53,
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
                                             104,
                                             105,
                                             106,
@@ -57371,6 +68847,7 @@
                                             134,
                                             135,
                                             136,
+                                            137,
                                             138,
                                             139,
                                             140,
@@ -57397,6 +68874,7 @@
                                             161,
                                             162,
                                             163,
+                                            164,
                                             165,
                                             166,
                                             167,
@@ -57413,9 +68891,12 @@
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -57439,8 +68920,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -57467,6 +68951,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -57481,6 +68966,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -57498,6 +68984,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -57524,6 +69011,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -57551,6 +69039,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -57569,18 +69058,109 @@
                                             345,
                                             346,
                                             347,
+                                            348,
                                             349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
                                             364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
                                             372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
                                             380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
                                             388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
                                             396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
                                             404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
                                             413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
                                             421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
                                             430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
                                             438,
-                                            447
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450
                                         ]
                                     }
                                 ],
@@ -57612,86 +69192,125 @@
                                             "CS301",
                                             "CS302",
                                             "CS401",
-                                            "CS501",
-                                            "RS106",
-                                            "RS205",
-                                            "RS208",
-                                            "RS210",
-                                            "RS305",
-                                            "RS306",
-                                            "RS307",
-                                            "RS310",
-                                            "RS406",
-                                            "RS407",
-                                            "RS409",
-                                            "RS503",
-                                            "RS508",
-                                            "RS509"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 2,
-                                        "stations": [
-                                            "DE601",
-                                            "DE602",
-                                            "DE603",
-                                            "DE604",
-                                            "DE605",
-                                            "DE609",
-                                            "FR606",
-                                            "SE607",
-                                            "UK608",
-                                            "PL610",
-                                            "PL611",
-                                            "PL612",
-                                            "IE613",
-                                            "LV614"
-                                        ]
-                                    },
-                                    {
-                                        "max_nr_missing": 1,
-                                        "stations": [
-                                            "DE601",
-                                            "DE605"
+                                            "CS501"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0.6624317181687094,
-                                    "angle2": 1.5579526427549426,
+                                    "angle1": 0.92934186635,
+                                    "angle2": 0.952579228492,
                                     "direction_type": "J2000",
-                                    "target": "Paaa+01Paaa+02REF"
+                                    "target": "Baaaa+bb"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 8
+                        }
+                    },
+                    "PT Pipeline": {
+                        "description": "Pulsar Pipeline for default HBA pulsar timing observation. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400",
+                        "short_description": "Baaaa+bb/PULP",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "dspsr": {
+                                "digifil": {
+                                    "channels_per_part": 20,
+                                    "coherent_dedispersion": false,
+                                    "dm": 0,
+                                    "integration_time_factor": 4
+                                },
+                                "enabled": true,
+                                "optimise_period_dm": false,
+                                "rfi_excision": true,
+                                "subintegration_length": 10
+                            },
+                            "output": {
+                                "dynamic_spectrum": {
+                                    "enabled": false,
+                                    "time_average": 0.5
+                                },
+                                "quantisation": {
+                                    "enabled": false,
+                                    "scale": 5
                                 }
-                            }
+                            },
+                            "presto": {
+                                "fold_profile": true,
+                                "input": {
+                                    "decode_sigma": 3,
+                                    "nr_blocks": 100,
+                                    "samples_per_block": 8192
+                                },
+                                "prepfold": false,
+                                "rrats": {
+                                    "dm_range": 5,
+                                    "enabled": false
+                                }
+                            },
+                            "pulsar": {
+                                "name": "",
+                                "strategy": "meta"
+                            },
+                            "single_pulse_search": false
                         },
                         "specifications_template": {
-                            "name": "target observation",
-                            "version": 9
+                            "name": "pulsar pipeline",
+                            "version": 6
                         }
                     }
                 }
             },
             "version": 1,
-            "id": 57,
-            "state_value": "active",
-            "purpose_value": "production"
+            "id": 69,
+            "state_value": "development",
+            "purpose_value": "technical_commissioning"
         },
         {
-            "description": "lofar2 test observation - IM HBA 1 beam",
-            "name": "Lofar2 IM HBA 1 beam",
+            "description": "Solar observing strategy. Imaging + Beamformed observation on the Sun and a calibrator with 127 tied-array beams and a preprocessing pipeline for each SAP. In parallel single station BF spectra in LBA and HBA and 4 consecutive FE observations.",
+            "name": "Solar Campaign",
             "purpose": "technical_commissioning",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
                 "version": 8
             },
-            "state": "development",
+            "state": "legacy",
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
                     {
-                        "name": "Stations",
+                        "name": "Stations - BF 1 station HBA",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/station_groups"
+                            "#/tasks/BF 1 station HBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Stations - BF 1 station LBA",
+                        "refs": [
+                            "#/tasks/BF 1 station LBA/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Stations - FE (1..4)",
+                        "refs": [
+                            "#/tasks/FE 1/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/FE 2/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/FE 3/specifications_doc/station_configuration/station_groups",
+                            "#/tasks/FE 4/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Stations - IM+BF",
+                        "refs": [
+                            "#/tasks/IM+BF/specifications_doc/station_configuration/station_groups"
                         ]
                     },
                     {
@@ -57701,35 +69320,129 @@
                         ]
                     },
                     {
-                        "name": "Observation Description",
+                        "name": "Duration (IM+BF, Sun LBA, Sun HBA)",
                         "refs": [
-                            "#/tasks/Target Observation/short_description"
+                            "#/tasks/IM+BF/specifications_doc/duration",
+                            "#/tasks/BF 1 station LBA/specifications_doc/duration",
+                            "#/tasks/BF 1 station HBA/specifications_doc/duration"
                         ]
                     },
                     {
-                        "name": "Target Pointing",
+                        "name": "Description IM+BF",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+                            "#/tasks/IM+BF/short_description"
                         ]
                     },
                     {
-                        "name": "Subbands",
+                        "name": "Description Preprecessing Sun",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                            "#/tasks/Preprocessing of Target/short_description"
                         ]
                     },
                     {
-                        "name": "Target Duration",
+                        "name": "Description Preprecessing Calibrator",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/duration"
+                            "#/tasks/Preprocessing of Calibrator/short_description"
                         ]
                     },
                     {
-                        "name": "Run Adder",
+                        "name": "Description LBA Sun Spectrum",
                         "refs": [
-                            "#/tasks/Target Observation/specifications_doc/QA/plots/enabled",
-                            "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled"
+                            "#/tasks/BF 1 station LBA/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Description HBA Sun Spectrum",
+                        "refs": [
+                            "#/tasks/BF 1 station HBA/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pointing Sun J2000 (IM+BF)",
+                        "refs": [
+                            "#/tasks/IM+BF/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+                        ]
+                    },
+                    {
+                        "name": "Pointing Calibrator (IM+BF)",
+                        "refs": [
+                            "#/tasks/IM+BF/specifications_doc/calibrator/pointing"
+                        ]
+                    },
+                    {
+                        "name": "Description FE1",
+                        "refs": [
+                            "#/tasks/FE 1/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Duration FE1",
+                        "refs": [
+                            "#/tasks/FE 1/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Pointing FE1",
+                        "refs": [
+                            "#/tasks/FE 1/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/FE 1/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Description FE2",
+                        "refs": [
+                            "#/tasks/FE 2/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Duration FE2",
+                        "refs": [
+                            "#/tasks/FE 2/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Pointing FE2",
+                        "refs": [
+                            "#/tasks/FE 2/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/FE 2/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Description FE3",
+                        "refs": [
+                            "#/tasks/FE 3/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Duration FE3",
+                        "refs": [
+                            "#/tasks/FE 3/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Pointing FE3",
+                        "refs": [
+                            "#/tasks/FE 3/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/FE 3/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Description FE4",
+                        "refs": [
+                            "#/tasks/FE 4/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Duration FE4",
+                        "refs": [
+                            "#/tasks/FE 4/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Pointing FE4",
+                        "refs": [
+                            "#/tasks/FE 4/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/FE 4/specifications_doc/station_configuration/tile_beam"
                         ]
                     }
                 ],
@@ -57739,7 +69452,6 @@
                         "require_day": false,
                         "require_night": false
                     },
-                    "location": "center",
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
@@ -57748,11 +69460,8 @@
                             "sun": 0
                         },
                         "min_elevation": {
-                            "calibrator": 0.05235987755982988,
-                            "target": 0.05235987755982988
-                        },
-                        "reference_pointing": {
-                            "enabled": false
+                            "calibrator": 0.1745329252,
+                            "target": 0.1745329252
                         },
                         "transit_offset": {
                             "from": -43200,
@@ -57771,70 +69480,930 @@
                 "task_relations": [
                     {
                         "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station HBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station LBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Preprocessing of Calibrator",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "IM+BF",
+                        "selection_doc": {
+                            "sap": [
+                                "calibrator"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Preprocessing of Target",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "IM+BF",
+                        "selection_doc": {
+                            "sap": [
+                                "IMBF_Sun"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "FE 1",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "FE 2",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "FE 3",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "FE 4",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "correlator"
+                        },
+                        "producer": "IM+BF",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "IM+BF",
+                        "selection_doc": {
+                            "sap": [
+                                "IMBF_Sun"
+                            ]
+                        },
+                        "selection_template": {
+                            "name": "SAP",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Preprocessing of Calibrator",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Preprocessing of Target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Preprocessing of Calibrator",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
                         "input": {
                             "dataformat": "MeasurementSet",
                             "datatype": "visibilities",
                             "role": "any"
                         },
                         "output": {
-                            "dataformat": "MeasurementSet",
-                            "datatype": "visibilities",
-                            "role": "correlator"
+                            "dataformat": "MeasurementSet",
+                            "datatype": "visibilities",
+                            "role": "any"
+                        },
+                        "producer": "Preprocessing of Target",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "IM+BF",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "producer": "BF 1 station HBA",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 4
+                        }
+                    },
+                    {
+                        "consumer": "Ingest",
+                        "input": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
+                        },
+                        "output": {
+                            "dataformat": "Beamformed",
+                            "datatype": "time series",
+                            "role": "beamformer"
                         },
-                        "producer": "Target Observation",
+                        "producer": "BF 1 station LBA",
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 6
+                            "version": 4
                         }
                     }
                 ],
-                "task_scheduling_relations": [],
-                "tasks": {
-                    "Cleanup": {
-                        "description": "Clean up all dataproducts from disk after ingest",
-                        "short_description": "",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
-                        }
+                "task_scheduling_relations": [
+                    {
+                        "first": "FE 1",
+                        "placement": "before",
+                        "second": "FE 2",
+                        "time_offset": 60
                     },
-                    "Target Observation": {
-                        "description": "Target Observation",
-                        "short_description": "_Target_Name_",
+                    {
+                        "first": "FE 2",
+                        "placement": "before",
+                        "second": "FE 3",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "FE 3",
+                        "placement": "before",
+                        "second": "FE 4",
+                        "time_offset": 60
+                    },
+                    {
+                        "first": "IM+BF",
+                        "placement": "parallel",
+                        "second": "BF 1 station HBA",
+                        "time_offset": 0
+                    },
+                    {
+                        "first": "IM+BF",
+                        "placement": "parallel",
+                        "second": "BF 1 station LBA",
+                        "time_offset": 0
+                    },
+                    {
+                        "first": "IM+BF",
+                        "placement": "parallel",
+                        "second": "FE 1",
+                        "time_offset": 0
+                    }
+                ],
+                "tasks": {
+                    "BF 1 station HBA": {
+                        "description": "Beamformed observation with a single station in HBA on the Sun, 105-188 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "Sun_spectrum_HBA-202303??-run1",
                         "specifications_doc": {
-                            "QA": {
-                                "file_conversion": {
-                                    "enabled": false,
-                                    "nr_of_subbands": -1,
-                                    "nr_of_timestamps": 256
-                                },
-                                "inspection_plots": "msplots",
-                                "plots": {
-                                    "autocorrelation": true,
-                                    "crosscorrelation": true,
-                                    "enabled": false
-                                }
-                            },
-                            "correlator": {
-                                "channels_per_subband": 64,
-                                "integration_time": 1,
-                                "storage_cluster": "CEP4",
-                                "topocentric_frequency_correction": false
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [
+                                                {
+                                                    "name": "SAP_Sun",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "SUN",
+                                                                "target": "Sun"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "RS508"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
                             },
-                            "duration": 60,
+                            "duration": 660,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 3.280425596160204,
-                                            "angle2": 1.5579526427549426,
-                                            "direction_type": "J2000",
-                                            "target": "target1"
+                                            "angle1": 0,
+                                            "angle2": 0,
+                                            "direction_type": "SUN",
+                                            "target": "Sun"
                                         },
-                                        "name": "target",
+                                        "name": "SAP_Sun",
                                         "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
                                             104,
                                             105,
                                             106,
@@ -57868,6 +70437,7 @@
                                             134,
                                             135,
                                             136,
+                                            137,
                                             138,
                                             139,
                                             140,
@@ -57894,6 +70464,7 @@
                                             161,
                                             162,
                                             163,
+                                            164,
                                             165,
                                             166,
                                             167,
@@ -57910,9 +70481,12 @@
                                             178,
                                             179,
                                             180,
+                                            181,
                                             182,
                                             183,
                                             184,
+                                            185,
+                                            186,
                                             187,
                                             188,
                                             189,
@@ -57936,8 +70510,11 @@
                                             207,
                                             208,
                                             209,
+                                            210,
+                                            211,
                                             212,
                                             213,
+                                            214,
                                             215,
                                             216,
                                             217,
@@ -57964,6 +70541,7 @@
                                             238,
                                             239,
                                             240,
+                                            241,
                                             242,
                                             243,
                                             244,
@@ -57978,6 +70556,7 @@
                                             253,
                                             254,
                                             255,
+                                            256,
                                             257,
                                             258,
                                             259,
@@ -57995,6 +70574,7 @@
                                             271,
                                             272,
                                             273,
+                                            274,
                                             275,
                                             276,
                                             277,
@@ -58021,6 +70601,7 @@
                                             298,
                                             299,
                                             300,
+                                            301,
                                             302,
                                             303,
                                             304,
@@ -58048,6 +70629,7 @@
                                             326,
                                             327,
                                             328,
+                                            329,
                                             330,
                                             331,
                                             332,
@@ -58059,417 +70641,148 @@
                                             338,
                                             339,
                                             340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
-                                            347,
-                                            349,
-                                            364,
-                                            372,
-                                            380,
-                                            388,
-                                            396,
-                                            404,
-                                            413,
-                                            421,
-                                            430,
-                                            438,
-                                            447
-                                        ]
-                                    }
-                                ],
-                                "antenna_set": "HBA_ZERO",
-                                "filter": "HBA_110_190",
-                                "station_groups": [
-                                    {
-                                        "max_nr_missing": 0,
-                                        "stations": [
-                                            "CS001"
-                                        ]
-                                    }
-                                ],
-                                "tile_beam": {
-                                    "angle1": 3.280425596160204,
-                                    "angle2": 1.5579526427549426,
-                                    "direction_type": "J2000",
-                                    "target": "target1"
-                                }
-                            }
-                        },
-                        "specifications_template": {
-                            "name": "target observation",
-                            "version": 9
-                        }
-                    }
-                }
-            },
-            "version": 1,
-            "id": 58,
-            "state_value": "development",
-            "purpose_value": "technical_commissioning"
-        },
-        {
-            "description": "A custom strategy to observe an FRB target preceeded by a 5min pulsar",
-            "name": "PT+FRB",
-            "purpose": "technical_commissioning",
-            "scheduling_unit_template": {
-                "name": "scheduling unit",
-                "version": 6
-            },
-            "state": "development",
-            "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/6/ref_resolved",
-                "parameters": [
-                    {
-                        "name": "Stations (PT & FRB observation)",
-                        "refs": [
-                            "#/tasks/FRB Observation/specifications_doc/station_configuration/station_groups",
-                            "#/tasks/PT Observation/specifications_doc/station_configuration/station_groups"
-                        ]
-                    },
-                    {
-                        "name": "Scheduling Constraints (PT & FRB observation)",
-                        "refs": [
-                            "#/scheduling_constraints_doc"
-                        ]
-                    },
-                    {
-                        "name": "FRB Duration",
-                        "refs": [
-                            "#/tasks/FRB Observation/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "FRB Observation Short Description",
-                        "refs": [
-                            "#/tasks/FRB Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "FRB Pipeline Short Description",
-                        "refs": [
-                            "#/tasks/FRB Pipeline/short_description"
-                        ]
-                    },
-                    {
-                        "name": "FRB Target Pointing",
-                        "refs": [
-                            "#/tasks/FRB Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/FRB Observation/specifications_doc/station_configuration/tile_beam"
-                        ]
-                    },
-                    {
-                        "name": "PT Duration",
-                        "refs": [
-                            "#/tasks/PT Observation/specifications_doc/duration"
-                        ]
-                    },
-                    {
-                        "name": "PT Observation Short Description",
-                        "refs": [
-                            "#/tasks/PT Observation/short_description"
-                        ]
-                    },
-                    {
-                        "name": "PT Pipeline Short Description",
-                        "refs": [
-                            "#/tasks/PT Pipeline/short_description"
-                        ]
-                    },
-                    {
-                        "name": "PT Target Pointing",
-                        "refs": [
-                            "#/tasks/PT Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
-                            "#/tasks/PT Observation/specifications_doc/station_configuration/tile_beam"
-                        ]
-                    },
-                    {
-                        "name": "PT Pipeline Optimise period & DM",
-                        "refs": [
-                            "#/tasks/PT Pipeline/specifications_doc/dspsr/optimise_period_dm"
-                        ]
-                    },
-                    {
-                        "name": "PT Pipeline Subintegration time",
-                        "refs": [
-                            "#/tasks/PT Pipeline/specifications_doc/dspsr/subintegration_length"
-                        ]
-                    }
-                ],
-                "scheduling_constraints_doc": {
-                    "scheduler": "dynamic",
-                    "sky": {
-                        "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0.00872665,
-                            "sun": 0.00872665
-                        },
-                        "min_elevation": {
-                            "target": 0.5235988
-                        },
-                        "transit_offset": {
-                            "from": -7200,
-                            "to": 7200
-                        }
-                    }
-                },
-                "scheduling_constraints_template": {
-                    "name": "constraints",
-                    "version": 6
-                },
-                "task_relations": [
-                    {
-                        "consumer": "FRB Pipeline",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "FRB Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "producer": "FRB Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "producer": "FRB Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "FRB Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "producer": "FRB Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "producer": "FRB Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "PT Pipeline",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "PT Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "producer": "PT Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Ingest",
-                        "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "producer": "PT Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "output": {
-                            "dataformat": "Beamformed",
-                            "datatype": "time series",
-                            "role": "beamformer"
-                        },
-                        "producer": "PT Observation",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp summary",
-                            "datatype": "quality",
-                            "role": "any"
-                        },
-                        "producer": "PT Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    },
-                    {
-                        "consumer": "Cleanup",
-                        "input": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
-                        },
-                        "output": {
-                            "dataformat": "pulp analysis",
-                            "datatype": "pulsar profile",
-                            "role": "any"
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "RS508"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
                         },
-                        "producer": "PT Pipeline",
-                        "selection_doc": {},
-                        "selection_template": {
-                            "name": "all",
-                            "version": 6
-                        }
-                    }
-                ],
-                "task_scheduling_relations": [
-                    {
-                        "first": "PT Observation",
-                        "placement": "before",
-                        "second": "FRB Observation",
-                        "time_offset": 60
-                    }
-                ],
-                "tasks": {
-                    "Cleanup": {
-                        "description": "Cleanup all dataproducts from disk",
-                        "specifications_doc": {},
                         "specifications_template": {
-                            "name": "cleanup",
-                            "version": 7
+                            "name": "beamforming observation",
+                            "version": 6
                         }
                     },
-                    "FRB Observation": {
-                        "description": "Beamforming CV FRB observation",
-                        "short_description": "FRByyyymmdd",
+                    "BF 1 station LBA": {
+                        "description": "Beamformed observation with a single station LBA on the Sun with a calibrator beam (default CasA), 5-88 MHz, 16 ch/SB, 0.01s",
+                        "short_description": "Sun_spectrum_LBA-202303??-run1",
                         "specifications_doc": {
                             "beamformer": {
                                 "pipelines": [
@@ -58477,12 +70790,432 @@
                                         "coherent": {
                                             "SAPs": [
                                                 {
-                                                    "name": "SAP0",
+                                                    "name": "SAP_Sun",
+                                                    "subbands": {
+                                                        "list": [
+                                                            54,
+                                                            55,
+                                                            56,
+                                                            57,
+                                                            58,
+                                                            59,
+                                                            60,
+                                                            61,
+                                                            62,
+                                                            63,
+                                                            64,
+                                                            65,
+                                                            66,
+                                                            67,
+                                                            68,
+                                                            69,
+                                                            70,
+                                                            71,
+                                                            72,
+                                                            73,
+                                                            74,
+                                                            75,
+                                                            76,
+                                                            77,
+                                                            78,
+                                                            79,
+                                                            80,
+                                                            81,
+                                                            82,
+                                                            83,
+                                                            84,
+                                                            85,
+                                                            86,
+                                                            87,
+                                                            88,
+                                                            89,
+                                                            90,
+                                                            91,
+                                                            92,
+                                                            93,
+                                                            94,
+                                                            95,
+                                                            96,
+                                                            97,
+                                                            98,
+                                                            99,
+                                                            100,
+                                                            101,
+                                                            102,
+                                                            103,
+                                                            104,
+                                                            105,
+                                                            106,
+                                                            107,
+                                                            108,
+                                                            109,
+                                                            110,
+                                                            111,
+                                                            112,
+                                                            113,
+                                                            114,
+                                                            115,
+                                                            116,
+                                                            117,
+                                                            118,
+                                                            119,
+                                                            120,
+                                                            121,
+                                                            122,
+                                                            123,
+                                                            124,
+                                                            125,
+                                                            126,
+                                                            127,
+                                                            128,
+                                                            129,
+                                                            130,
+                                                            131,
+                                                            132,
+                                                            133,
+                                                            134,
+                                                            135,
+                                                            136,
+                                                            137,
+                                                            138,
+                                                            139,
+                                                            140,
+                                                            141,
+                                                            142,
+                                                            143,
+                                                            144,
+                                                            145,
+                                                            146,
+                                                            147,
+                                                            148,
+                                                            149,
+                                                            150,
+                                                            151,
+                                                            152,
+                                                            153,
+                                                            154,
+                                                            155,
+                                                            156,
+                                                            157,
+                                                            158,
+                                                            159,
+                                                            160,
+                                                            161,
+                                                            162,
+                                                            163,
+                                                            164,
+                                                            165,
+                                                            166,
+                                                            167,
+                                                            168,
+                                                            169,
+                                                            170,
+                                                            171,
+                                                            172,
+                                                            173,
+                                                            174,
+                                                            175,
+                                                            176,
+                                                            177,
+                                                            178,
+                                                            179,
+                                                            180,
+                                                            181,
+                                                            182,
+                                                            183,
+                                                            184,
+                                                            185,
+                                                            186,
+                                                            187,
+                                                            188,
+                                                            189,
+                                                            190,
+                                                            191,
+                                                            192,
+                                                            193,
+                                                            194,
+                                                            195,
+                                                            196,
+                                                            197,
+                                                            198,
+                                                            199,
+                                                            200,
+                                                            201,
+                                                            202,
+                                                            203,
+                                                            204,
+                                                            205,
+                                                            206,
+                                                            207,
+                                                            208,
+                                                            209,
+                                                            210,
+                                                            211,
+                                                            212,
+                                                            213,
+                                                            214,
+                                                            215,
+                                                            216,
+                                                            217,
+                                                            218,
+                                                            219,
+                                                            220,
+                                                            221,
+                                                            222,
+                                                            223,
+                                                            224,
+                                                            225,
+                                                            226,
+                                                            227,
+                                                            228,
+                                                            229,
+                                                            230,
+                                                            231,
+                                                            232,
+                                                            233,
+                                                            234,
+                                                            235,
+                                                            236,
+                                                            237,
+                                                            238,
+                                                            239,
+                                                            240,
+                                                            241,
+                                                            242,
+                                                            243,
+                                                            244,
+                                                            245,
+                                                            246,
+                                                            247,
+                                                            248,
+                                                            249,
+                                                            250,
+                                                            251,
+                                                            252,
+                                                            253,
+                                                            254,
+                                                            255,
+                                                            256,
+                                                            257,
+                                                            258,
+                                                            259,
+                                                            260,
+                                                            261,
+                                                            262,
+                                                            263,
+                                                            264,
+                                                            265,
+                                                            266,
+                                                            267,
+                                                            268,
+                                                            269,
+                                                            270,
+                                                            271,
+                                                            272,
+                                                            273,
+                                                            274,
+                                                            275,
+                                                            276,
+                                                            277,
+                                                            278,
+                                                            279,
+                                                            280,
+                                                            281,
+                                                            282,
+                                                            283,
+                                                            284,
+                                                            285,
+                                                            286,
+                                                            287,
+                                                            288,
+                                                            289,
+                                                            290,
+                                                            291,
+                                                            292,
+                                                            293,
+                                                            294,
+                                                            295,
+                                                            296,
+                                                            297,
+                                                            298,
+                                                            299,
+                                                            300,
+                                                            301,
+                                                            302,
+                                                            303,
+                                                            304,
+                                                            305,
+                                                            306,
+                                                            307,
+                                                            308,
+                                                            309,
+                                                            310,
+                                                            311,
+                                                            312,
+                                                            313,
+                                                            314,
+                                                            315,
+                                                            316,
+                                                            317,
+                                                            318,
+                                                            319,
+                                                            320,
+                                                            321,
+                                                            322,
+                                                            323,
+                                                            324,
+                                                            325,
+                                                            326,
+                                                            327,
+                                                            328,
+                                                            329,
+                                                            330,
+                                                            331,
+                                                            332,
+                                                            333,
+                                                            334,
+                                                            335,
+                                                            336,
+                                                            337,
+                                                            338,
+                                                            339,
+                                                            340,
+                                                            341,
+                                                            342,
+                                                            343,
+                                                            344,
+                                                            345,
+                                                            346,
+                                                            347,
+                                                            348,
+                                                            349,
+                                                            350,
+                                                            351,
+                                                            352,
+                                                            353,
+                                                            354,
+                                                            355,
+                                                            356,
+                                                            357,
+                                                            358,
+                                                            359,
+                                                            360,
+                                                            361,
+                                                            362,
+                                                            363,
+                                                            364,
+                                                            365,
+                                                            366,
+                                                            367,
+                                                            368,
+                                                            369,
+                                                            370,
+                                                            371,
+                                                            372,
+                                                            373,
+                                                            374,
+                                                            375,
+                                                            376,
+                                                            377,
+                                                            378,
+                                                            379,
+                                                            380,
+                                                            381,
+                                                            382,
+                                                            383,
+                                                            384,
+                                                            385,
+                                                            386,
+                                                            387,
+                                                            388,
+                                                            389,
+                                                            390,
+                                                            391,
+                                                            392,
+                                                            393,
+                                                            394,
+                                                            395,
+                                                            396,
+                                                            397,
+                                                            398,
+                                                            399,
+                                                            400,
+                                                            401,
+                                                            402,
+                                                            403,
+                                                            404,
+                                                            405,
+                                                            406,
+                                                            407,
+                                                            408,
+                                                            409,
+                                                            410,
+                                                            411,
+                                                            412,
+                                                            413,
+                                                            414,
+                                                            415,
+                                                            416,
+                                                            417,
+                                                            418,
+                                                            419,
+                                                            420,
+                                                            421,
+                                                            422,
+                                                            423,
+                                                            424,
+                                                            425,
+                                                            426,
+                                                            427,
+                                                            428,
+                                                            429,
+                                                            430,
+                                                            431,
+                                                            432,
+                                                            433,
+                                                            434,
+                                                            435,
+                                                            436,
+                                                            437,
+                                                            438,
+                                                            439,
+                                                            440,
+                                                            441,
+                                                            442,
+                                                            443,
+                                                            444,
+                                                            445,
+                                                            446,
+                                                            447,
+                                                            448,
+                                                            449,
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
+                                                        ],
+                                                        "method": "copy"
+                                                    },
+                                                    "tab_rings": {
+                                                        "count": 0,
+                                                        "width": 0.01
+                                                    },
+                                                    "tabs": [
+                                                        {
+                                                            "pointing": {
+                                                                "angle1": 0,
+                                                                "angle2": 0,
+                                                                "direction_type": "SUN",
+                                                                "target": "Sun"
+                                                            },
+                                                            "relative": true
+                                                        }
+                                                    ]
+                                                },
+                                                {
+                                                    "name": "SAP_Cal",
                                                     "subbands": {
                                                         "list": [
-                                                            51,
-                                                            52,
-                                                            53,
                                                             54,
                                                             55,
                                                             56,
@@ -58879,7 +71612,10 @@
                                                             447,
                                                             448,
                                                             449,
-                                                            450
+                                                            450,
+                                                            451,
+                                                            452,
+                                                            453
                                                         ],
                                                         "method": "copy"
                                                     },
@@ -58893,13 +71629,2273 @@
                                                                 "angle1": 0,
                                                                 "angle2": 0,
                                                                 "direction_type": "J2000",
-                                                                "target": "OnTarget"
+                                                                "target": "Calibrator"
                                                             },
                                                             "relative": true
                                                         }
                                                     ]
                                                 }
                                             ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "CS_Sun",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 0,
+                                                "stations": [
+                                                    "RS210"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 660,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0,
+                                            "angle2": 0,
+                                            "direction_type": "SUN",
+                                            "target": "Sun"
+                                        },
+                                        "name": "SAP_Sun",
+                                        "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    },
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 6.123487680622106,
+                                            "angle2": 1.026515399560465,
+                                            "direction_type": "J2000",
+                                            "target": "CasA"
+                                        },
+                                        "name": "SAP_Cal",
+                                        "subbands": [
+                                            54,
+                                            80,
+                                            84,
+                                            88,
+                                            92,
+                                            96,
+                                            100,
+                                            104,
+                                            108,
+                                            112,
+                                            116,
+                                            120,
+                                            124,
+                                            128,
+                                            132,
+                                            136,
+                                            140,
+                                            144,
+                                            148,
+                                            152,
+                                            156,
+                                            160,
+                                            164,
+                                            168,
+                                            172,
+                                            176,
+                                            180,
+                                            184,
+                                            188,
+                                            192,
+                                            196,
+                                            200,
+                                            204,
+                                            208,
+                                            212,
+                                            216,
+                                            220,
+                                            224,
+                                            228,
+                                            232,
+                                            236,
+                                            240,
+                                            244,
+                                            248,
+                                            252,
+                                            256,
+                                            260,
+                                            264,
+                                            268,
+                                            272,
+                                            276,
+                                            280,
+                                            284,
+                                            288,
+                                            292,
+                                            296,
+                                            300,
+                                            304,
+                                            308,
+                                            312,
+                                            316,
+                                            320,
+                                            324,
+                                            328,
+                                            332,
+                                            336,
+                                            340,
+                                            344,
+                                            348,
+                                            352,
+                                            356,
+                                            360,
+                                            364,
+                                            368,
+                                            372,
+                                            376,
+                                            380,
+                                            384,
+                                            388,
+                                            392,
+                                            394,
+                                            396,
+                                            400,
+                                            404,
+                                            408,
+                                            412
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "RS210"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0,
+                                    "angle2": 0,
+                                    "direction_type": "SUN",
+                                    "target": "Sun"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 6
+                        }
+                    },
+                    "Cleanup": {
+                        "description": "Cleaning up all output dataproducts for this scheduling unit",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 4
+                        }
+                    },
+                    "FE 1": {
+                        "description": "First Fly's Eye observation with International and some Remote stations with conversion to dynspec enabled, 105-188 MHz, 16ch/SB, 0.01s",
+                        "short_description": "IPS FE1",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "dynspec",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": true,
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "FE",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
+                                                    "RS310",
+                                                    "RS509",
+                                                    "DE601",
+                                                    "DE602",
+                                                    "DE603",
+                                                    "DE604",
+                                                    "DE605",
+                                                    "DE609",
+                                                    "FR606",
+                                                    "SE607",
+                                                    "UK608",
+                                                    "PL610",
+                                                    "PL611",
+                                                    "PL612",
+                                                    "IE613",
+                                                    "LV614"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_IPS_"
+                                        },
+                                        "name": "FE_pointing",
+                                        "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
+                                            "RS310",
+                                            "RS509",
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_IPS_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 6
+                        }
+                    },
+                    "FE 2": {
+                        "description": "Second Fly's Eye observation with International and some Remote stations with conversion to dynspec enabled, 105-188 MHz, 16ch/SB, 0.01s",
+                        "short_description": "IPS FE2",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "dynspec",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": true,
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "FE",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
+                                                    "RS310",
+                                                    "RS509",
+                                                    "DE601",
+                                                    "DE602",
+                                                    "DE603",
+                                                    "DE604",
+                                                    "DE605",
+                                                    "DE609",
+                                                    "FR606",
+                                                    "SE607",
+                                                    "UK608",
+                                                    "PL610",
+                                                    "PL611",
+                                                    "PL612",
+                                                    "IE613",
+                                                    "LV614"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_IPS_"
+                                        },
+                                        "name": "FE_pointing",
+                                        "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
+                                            "RS310",
+                                            "RS509",
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_IPS_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 6
+                        }
+                    },
+                    "FE 3": {
+                        "description": "Third Fly's Eye observation with International and some Remote stations with conversion to dynspec enabled, 105-188 MHz, 16ch/SB, 0.01s",
+                        "short_description": "IPS FE3",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "dynspec",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": true,
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "FE",
+                                        "station_groups": [
+                                            {
+                                                "max_nr_missing": 14,
+                                                "stations": [
+                                                    "RS310",
+                                                    "RS509",
+                                                    "DE601",
+                                                    "DE602",
+                                                    "DE603",
+                                                    "DE604",
+                                                    "DE605",
+                                                    "DE609",
+                                                    "FR606",
+                                                    "SE607",
+                                                    "UK608",
+                                                    "PL610",
+                                                    "PL611",
+                                                    "PL612",
+                                                    "IE613",
+                                                    "LV614"
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "ppf": false
+                            },
+                            "duration": 120,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
+                                            "direction_type": "J2000",
+                                            "target": "_target_name_IPS_"
+                                        },
+                                        "name": "FE_pointing",
+                                        "subbands": [
+                                            54,
+                                            55,
+                                            56,
+                                            57,
+                                            58,
+                                            59,
+                                            60,
+                                            61,
+                                            62,
+                                            63,
+                                            64,
+                                            65,
+                                            66,
+                                            67,
+                                            68,
+                                            69,
+                                            70,
+                                            71,
+                                            72,
+                                            73,
+                                            74,
+                                            75,
+                                            76,
+                                            77,
+                                            78,
+                                            79,
+                                            80,
+                                            81,
+                                            82,
+                                            83,
+                                            84,
+                                            85,
+                                            86,
+                                            87,
+                                            88,
+                                            89,
+                                            90,
+                                            91,
+                                            92,
+                                            93,
+                                            94,
+                                            95,
+                                            96,
+                                            97,
+                                            98,
+                                            99,
+                                            100,
+                                            101,
+                                            102,
+                                            103,
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            137,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            164,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            181,
+                                            182,
+                                            183,
+                                            184,
+                                            185,
+                                            186,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            210,
+                                            211,
+                                            212,
+                                            213,
+                                            214,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            241,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            256,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            274,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            301,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            329,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            348,
+                                            349,
+                                            350,
+                                            351,
+                                            352,
+                                            353,
+                                            354,
+                                            355,
+                                            356,
+                                            357,
+                                            358,
+                                            359,
+                                            360,
+                                            361,
+                                            362,
+                                            363,
+                                            364,
+                                            365,
+                                            366,
+                                            367,
+                                            368,
+                                            369,
+                                            370,
+                                            371,
+                                            372,
+                                            373,
+                                            374,
+                                            375,
+                                            376,
+                                            377,
+                                            378,
+                                            379,
+                                            380,
+                                            381,
+                                            382,
+                                            383,
+                                            384,
+                                            385,
+                                            386,
+                                            387,
+                                            388,
+                                            389,
+                                            390,
+                                            391,
+                                            392,
+                                            393,
+                                            394,
+                                            395,
+                                            396,
+                                            397,
+                                            398,
+                                            399,
+                                            400,
+                                            401,
+                                            402,
+                                            403,
+                                            404,
+                                            405,
+                                            406,
+                                            407,
+                                            408,
+                                            409,
+                                            410,
+                                            411,
+                                            412,
+                                            413,
+                                            414,
+                                            415,
+                                            416,
+                                            417,
+                                            418,
+                                            419,
+                                            420,
+                                            421,
+                                            422,
+                                            423,
+                                            424,
+                                            425,
+                                            426,
+                                            427,
+                                            428,
+                                            429,
+                                            430,
+                                            431,
+                                            432,
+                                            433,
+                                            434,
+                                            435,
+                                            436,
+                                            437,
+                                            438,
+                                            439,
+                                            440,
+                                            441,
+                                            442,
+                                            443,
+                                            444,
+                                            445,
+                                            446,
+                                            447,
+                                            448,
+                                            449,
+                                            450,
+                                            451,
+                                            452,
+                                            453
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 14,
+                                        "stations": [
+                                            "RS310",
+                                            "RS509",
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_target_name_IPS_"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "beamforming observation",
+                            "version": 6
+                        }
+                    },
+                    "FE 4": {
+                        "description": "Fourth Fly's Eye observation with International and some Remote stations with conversion to dynspec enabled, 105-188 MHz, 16ch/SB, 0.01s",
+                        "short_description": "IPS FE4",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "dynspec",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "beamformer": {
+                                "pipelines": [
+                                    {
+                                        "coherent": {
+                                            "SAPs": [],
                                             "settings": {
                                                 "channels_per_subband": 1,
                                                 "quantisation": {
@@ -58908,39 +73904,62 @@
                                                     "scale_max": 5,
                                                     "scale_min": -5
                                                 },
-                                                "stokes": "XXYY",
-                                                "subbands_per_file": 20,
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
                                                 "time_integration_factor": 1
                                             }
                                         },
-                                        "name": "Beamformer CV",
+                                        "flys eye": {
+                                            "enabled": true,
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "FE",
                                         "station_groups": [
                                             {
-                                                "max_nr_missing": 4,
+                                                "max_nr_missing": 14,
                                                 "stations": [
-                                                    "CS002",
-                                                    "CS003",
-                                                    "CS004",
-                                                    "CS005",
-                                                    "CS006",
-                                                    "CS007",
-                                                    "CS011",
-                                                    "CS013",
-                                                    "CS017",
-                                                    "CS021",
-                                                    "CS024",
-                                                    "CS026",
-                                                    "CS028",
-                                                    "CS030",
-                                                    "CS031",
-                                                    "CS032",
-                                                    "CS101",
-                                                    "CS103",
-                                                    "CS201",
-                                                    "CS301",
-                                                    "CS302",
-                                                    "CS401",
-                                                    "CS501"
+                                                    "RS310",
+                                                    "RS509",
+                                                    "DE601",
+                                                    "DE602",
+                                                    "DE603",
+                                                    "DE604",
+                                                    "DE605",
+                                                    "DE609",
+                                                    "FR606",
+                                                    "SE607",
+                                                    "UK608",
+                                                    "PL610",
+                                                    "PL611",
+                                                    "PL612",
+                                                    "IE613",
+                                                    "LV614"
                                                 ]
                                             }
                                         ]
@@ -58948,21 +73967,18 @@
                                 ],
                                 "ppf": false
                             },
-                            "duration": 3600,
+                            "duration": 120,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.92934186635,
-                                            "angle2": 0.952579228492,
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Baaaa+bb"
+                                            "target": "_target_name_IPS_"
                                         },
-                                        "name": "SAP0",
+                                        "name": "FE_pointing",
                                         "subbands": [
-                                            51,
-                                            52,
-                                            53,
                                             54,
                                             55,
                                             56,
@@ -59359,554 +74375,162 @@
                                             447,
                                             448,
                                             449,
-                                            450
+                                            450,
+                                            451,
+                                            452,
+                                            453
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
+                                "antenna_set": "HBA_DUAL",
                                 "filter": "HBA_110_190",
                                 "station_groups": [
                                     {
-                                        "max_nr_missing": 4,
+                                        "max_nr_missing": 14,
                                         "stations": [
-                                            "CS002",
-                                            "CS003",
-                                            "CS004",
-                                            "CS005",
-                                            "CS006",
-                                            "CS007",
-                                            "CS011",
-                                            "CS013",
-                                            "CS017",
-                                            "CS021",
-                                            "CS024",
-                                            "CS026",
-                                            "CS028",
-                                            "CS030",
-                                            "CS031",
-                                            "CS032",
-                                            "CS101",
-                                            "CS103",
-                                            "CS201",
-                                            "CS301",
-                                            "CS302",
-                                            "CS401",
-                                            "CS501"
+                                            "RS310",
+                                            "RS509",
+                                            "DE601",
+                                            "DE602",
+                                            "DE603",
+                                            "DE604",
+                                            "DE605",
+                                            "DE609",
+                                            "FR606",
+                                            "SE607",
+                                            "UK608",
+                                            "PL610",
+                                            "PL611",
+                                            "PL612",
+                                            "IE613",
+                                            "LV614"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0.92934186635,
-                                    "angle2": 0.952579228492,
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "Baaaa+bb"
+                                    "target": "_target_name_IPS_"
                                 }
                             }
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 8
-                        }
-                    },
-                    "FRB Pipeline": {
-                        "description": "Pulsar Pipeline for conversion to raw 8 bit data only. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400 ",
-                        "short_description": "Baaaa+bb/PULP",
-                        "specifications_doc": {
-                            "cluster_resources": {
-                                "cores_per_task": 2,
-                                "parallel_tasks": 20,
-                                "where": {
-                                    "cluster": "CEP4",
-                                    "partition": "cpu"
-                                }
-                            },
-                            "dspsr": {
-                                "digifil": {
-                                    "channels_per_part": 20,
-                                    "coherent_dedispersion": false,
-                                    "dm": 0,
-                                    "integration_time_factor": 4
-                                },
-                                "enabled": false,
-                                "optimise_period_dm": false,
-                                "rfi_excision": true,
-                                "subintegration_length": -1
-                            },
-                            "output": {
-                                "dynamic_spectrum": {
-                                    "enabled": false,
-                                    "time_average": 0.5
-                                },
-                                "quantisation": {
-                                    "enabled": true,
-                                    "scale": 5
-                                }
-                            },
-                            "presto": {
-                                "fold_profile": true,
-                                "input": {
-                                    "decode_sigma": 3,
-                                    "nr_blocks": 100,
-                                    "samples_per_block": 8192
-                                },
-                                "prepfold": false,
-                                "rrats": {
-                                    "dm_range": 5,
-                                    "enabled": false
-                                }
-                            },
-                            "pulsar": {
-                                "name": "",
-                                "strategy": "meta"
-                            },
-                            "single_pulse_search": false
-                        },
-                        "specifications_template": {
-                            "name": "pulsar pipeline",
                             "version": 6
                         }
                     },
-                    "Ingest": {
-                        "description": "Ingest the pipeline outputs dataproducts",
-                        "specifications_doc": {},
-                        "specifications_template": {
-                            "name": "ingest",
-                            "version": 7
-                        }
-                    },
-                    "PT Observation": {
-                        "description": "Beamforming observation for default pulsar timing with HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400",
-                        "short_description": "Baaaa+bb",
+                    "IM+BF": {
+                        "description": "Imaging + Beamformed Observation on the Sun with a calibrator beam. LBA_OUTER, 19-80 MHz (sparse), 127 TABs, IM 12.2kHz, 0.17s, BF: 12.2 kHz, 0.01s",
+                        "short_description": "Sun-202303??-run1",
                         "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
                             "beamformer": {
                                 "pipelines": [
                                     {
                                         "coherent": {
                                             "SAPs": [
                                                 {
-                                                    "name": "SAP0",
+                                                    "name": "IMBF_Sun",
                                                     "subbands": {
                                                         "list": [
-                                                            51,
-                                                            52,
-                                                            53,
-                                                            54,
-                                                            55,
-                                                            56,
-                                                            57,
-                                                            58,
-                                                            59,
-                                                            60,
-                                                            61,
-                                                            62,
-                                                            63,
-                                                            64,
-                                                            65,
-                                                            66,
-                                                            67,
-                                                            68,
-                                                            69,
-                                                            70,
-                                                            71,
-                                                            72,
-                                                            73,
-                                                            74,
-                                                            75,
-                                                            76,
-                                                            77,
-                                                            78,
-                                                            79,
-                                                            80,
-                                                            81,
-                                                            82,
-                                                            83,
-                                                            84,
-                                                            85,
-                                                            86,
-                                                            87,
-                                                            88,
-                                                            89,
-                                                            90,
-                                                            91,
-                                                            92,
-                                                            93,
-                                                            94,
-                                                            95,
                                                             96,
-                                                            97,
-                                                            98,
-                                                            99,
-                                                            100,
-                                                            101,
-                                                            102,
-                                                            103,
                                                             104,
-                                                            105,
                                                             106,
-                                                            107,
-                                                            108,
-                                                            109,
                                                             110,
-                                                            111,
-                                                            112,
-                                                            113,
-                                                            114,
-                                                            115,
-                                                            116,
                                                             117,
-                                                            118,
-                                                            119,
-                                                            120,
                                                             121,
-                                                            122,
-                                                            123,
-                                                            124,
-                                                            125,
                                                             126,
-                                                            127,
-                                                            128,
-                                                            129,
-                                                            130,
                                                             131,
-                                                            132,
-                                                            133,
-                                                            134,
-                                                            135,
                                                             136,
-                                                            137,
-                                                            138,
-                                                            139,
-                                                            140,
                                                             141,
-                                                            142,
-                                                            143,
-                                                            144,
-                                                            145,
                                                             146,
-                                                            147,
-                                                            148,
-                                                            149,
                                                             150,
-                                                            151,
-                                                            152,
-                                                            153,
-                                                            154,
-                                                            155,
                                                             156,
-                                                            157,
-                                                            158,
-                                                            159,
-                                                            160,
                                                             161,
-                                                            162,
-                                                            163,
-                                                            164,
-                                                            165,
-                                                            166,
-                                                            167,
-                                                            168,
-                                                            169,
-                                                            170,
-                                                            171,
                                                             172,
-                                                            173,
-                                                            174,
-                                                            175,
-                                                            176,
-                                                            177,
                                                             178,
-                                                            179,
-                                                            180,
-                                                            181,
-                                                            182,
                                                             183,
-                                                            184,
-                                                            185,
-                                                            186,
-                                                            187,
-                                                            188,
                                                             189,
-                                                            190,
-                                                            191,
-                                                            192,
-                                                            193,
                                                             194,
-                                                            195,
-                                                            196,
-                                                            197,
-                                                            198,
-                                                            199,
-                                                            200,
                                                             201,
-                                                            202,
-                                                            203,
-                                                            204,
-                                                            205,
                                                             206,
-                                                            207,
-                                                            208,
-                                                            209,
-                                                            210,
                                                             211,
-                                                            212,
-                                                            213,
-                                                            214,
-                                                            215,
                                                             216,
-                                                            217,
-                                                            218,
-                                                            219,
-                                                            220,
                                                             221,
-                                                            222,
-                                                            223,
-                                                            224,
-                                                            225,
-                                                            226,
-                                                            227,
-                                                            228,
-                                                            229,
-                                                            230,
-                                                            231,
                                                             232,
-                                                            233,
-                                                            234,
-                                                            235,
-                                                            236,
                                                             237,
-                                                            238,
-                                                            239,
-                                                            240,
-                                                            241,
-                                                            242,
-                                                            243,
                                                             244,
-                                                            245,
-                                                            246,
-                                                            247,
-                                                            248,
                                                             249,
-                                                            250,
-                                                            251,
-                                                            252,
-                                                            253,
-                                                            254,
                                                             255,
-                                                            256,
-                                                            257,
-                                                            258,
-                                                            259,
-                                                            260,
-                                                            261,
-                                                            262,
                                                             263,
-                                                            264,
-                                                            265,
-                                                            266,
-                                                            267,
-                                                            268,
                                                             269,
-                                                            270,
-                                                            271,
-                                                            272,
-                                                            273,
                                                             274,
-                                                            275,
-                                                            276,
-                                                            277,
-                                                            278,
                                                             279,
-                                                            280,
-                                                            281,
-                                                            282,
                                                             283,
-                                                            284,
-                                                            285,
-                                                            286,
-                                                            287,
-                                                            288,
-                                                            289,
-                                                            290,
-                                                            291,
-                                                            292,
-                                                            293,
-                                                            294,
                                                             295,
-                                                            296,
-                                                            297,
-                                                            298,
-                                                            299,
                                                             300,
-                                                            301,
                                                             302,
-                                                            303,
-                                                            304,
-                                                            305,
-                                                            306,
-                                                            307,
-                                                            308,
-                                                            309,
-                                                            310,
-                                                            311,
                                                             312,
-                                                            313,
-                                                            314,
-                                                            315,
                                                             316,
-                                                            317,
-                                                            318,
-                                                            319,
                                                             320,
-                                                            321,
-                                                            322,
-                                                            323,
-                                                            324,
-                                                            325,
-                                                            326,
-                                                            327,
                                                             328,
-                                                            329,
                                                             330,
-                                                            331,
-                                                            332,
                                                             333,
-                                                            334,
-                                                            335,
-                                                            336,
-                                                            337,
                                                             338,
-                                                            339,
                                                             340,
-                                                            341,
-                                                            342,
-                                                            343,
-                                                            344,
-                                                            345,
-                                                            346,
                                                             347,
-                                                            348,
-                                                            349,
-                                                            350,
                                                             351,
-                                                            352,
-                                                            353,
-                                                            354,
-                                                            355,
                                                             356,
-                                                            357,
-                                                            358,
-                                                            359,
                                                             360,
-                                                            361,
-                                                            362,
-                                                            363,
-                                                            364,
-                                                            365,
                                                             366,
-                                                            367,
-                                                            368,
-                                                            369,
                                                             370,
-                                                            371,
-                                                            372,
-                                                            373,
-                                                            374,
-                                                            375,
                                                             376,
-                                                            377,
-                                                            378,
-                                                            379,
                                                             380,
-                                                            381,
-                                                            382,
-                                                            383,
-                                                            384,
                                                             385,
-                                                            386,
-                                                            387,
-                                                            388,
                                                             389,
-                                                            390,
                                                             391,
-                                                            392,
-                                                            393,
                                                             394,
-                                                            395,
-                                                            396,
-                                                            397,
-                                                            398,
-                                                            399,
                                                             400,
-                                                            401,
-                                                            402,
-                                                            403,
                                                             404,
-                                                            405,
-                                                            406,
-                                                            407,
-                                                            408,
-                                                            409,
-                                                            410,
-                                                            411,
-                                                            412,
-                                                            413,
-                                                            414,
-                                                            415,
-                                                            416,
-                                                            417,
-                                                            418,
-                                                            419,
-                                                            420,
-                                                            421,
-                                                            422,
-                                                            423,
-                                                            424,
-                                                            425,
-                                                            426,
-                                                            427,
-                                                            428,
-                                                            429,
-                                                            430,
-                                                            431,
-                                                            432,
-                                                            433,
-                                                            434,
-                                                            435,
-                                                            436,
-                                                            437,
-                                                            438,
-                                                            439,
-                                                            440,
-                                                            441,
-                                                            442,
-                                                            443,
-                                                            444,
-                                                            445,
-                                                            446,
-                                                            447,
-                                                            448,
-                                                            449,
-                                                            450
+                                                            410
                                                         ],
                                                         "method": "copy"
                                                     },
                                                     "tab_rings": {
-                                                        "count": 0,
-                                                        "width": 0.01
+                                                        "count": 6,
+                                                        "width": 0.00174533
                                                     },
-                                                    "tabs": [
-                                                        {
-                                                            "pointing": {
-                                                                "angle1": 0,
-                                                                "angle2": 0,
-                                                                "direction_type": "J2000",
-                                                                "target": "OnTarget"
-                                                            },
-                                                            "relative": true
-                                                        }
-                                                    ]
+                                                    "tabs": []
                                                 }
                                             ],
+                                            "settings": {
+                                                "channels_per_subband": 16,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "IQUV",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 128
+                                            }
+                                        },
+                                        "flys eye": {
+                                            "enabled": false,
                                             "settings": {
                                                 "channels_per_subband": 1,
                                                 "quantisation": {
@@ -59915,12 +74539,27 @@
                                                     "scale_max": 5,
                                                     "scale_min": -5
                                                 },
-                                                "stokes": "XXYY",
-                                                "subbands_per_file": 20,
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
                                                 "time_integration_factor": 1
                                             }
                                         },
-                                        "name": "Beamformer CV",
+                                        "incoherent": {
+                                            "SAPs": [],
+                                            "settings": {
+                                                "channels_per_subband": 1,
+                                                "quantisation": {
+                                                    "bits": 8,
+                                                    "enabled": false,
+                                                    "scale_max": 5,
+                                                    "scale_min": -5
+                                                },
+                                                "stokes": "I",
+                                                "subbands_per_file": 488,
+                                                "time_integration_factor": 1
+                                            }
+                                        },
+                                        "name": "MultiRings_Beamformer",
                                         "station_groups": [
                                             {
                                                 "max_nr_missing": 4,
@@ -59939,14 +74578,14 @@
                                                     "CS026",
                                                     "CS028",
                                                     "CS030",
-                                                    "CS031",
                                                     "CS032",
-                                                    "CS101",
-                                                    "CS103",
-                                                    "CS201",
+                                                    "CS031",
                                                     "CS301",
                                                     "CS302",
                                                     "CS401",
+                                                    "CS101",
+                                                    "CS103",
+                                                    "CS201",
                                                     "CS501"
                                                 ]
                                             }
@@ -59955,423 +74594,99 @@
                                 ],
                                 "ppf": false
                             },
-                            "duration": 300,
+                            "calibrator": {
+                                "autoselect": false,
+                                "name": "calibrator",
+                                "pointing": {
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
+                                    "direction_type": "J2000",
+                                    "target": "_calibrator_name_"
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 16,
+                                "integration_time": 0.166666,
+                                "storage_cluster": "CEP4",
+                                "topocentric_frequency_correction": false
+                            },
+                            "duration": 660,
                             "station_configuration": {
                                 "SAPs": [
                                     {
                                         "digital_pointing": {
-                                            "angle1": 0.92934186635,
-                                            "angle2": 0.952579228492,
+                                            "angle1": 0.6624317181687094,
+                                            "angle2": 1.5579526427549426,
                                             "direction_type": "J2000",
-                                            "target": "Baaaa+bb"
+                                            "target": "_target_name_"
                                         },
-                                        "name": "SAP0",
-                                        "subbands": [
-                                            51,
-                                            52,
-                                            53,
-                                            54,
-                                            55,
-                                            56,
-                                            57,
-                                            58,
-                                            59,
-                                            60,
-                                            61,
-                                            62,
-                                            63,
-                                            64,
-                                            65,
-                                            66,
-                                            67,
-                                            68,
-                                            69,
-                                            70,
-                                            71,
-                                            72,
-                                            73,
-                                            74,
-                                            75,
-                                            76,
-                                            77,
-                                            78,
-                                            79,
-                                            80,
-                                            81,
-                                            82,
-                                            83,
-                                            84,
-                                            85,
-                                            86,
-                                            87,
-                                            88,
-                                            89,
-                                            90,
-                                            91,
-                                            92,
-                                            93,
-                                            94,
-                                            95,
-                                            96,
-                                            97,
-                                            98,
-                                            99,
-                                            100,
-                                            101,
-                                            102,
-                                            103,
-                                            104,
-                                            105,
-                                            106,
-                                            107,
-                                            108,
-                                            109,
-                                            110,
-                                            111,
-                                            112,
-                                            113,
-                                            114,
-                                            115,
-                                            116,
+                                        "name": "IMBF_Sun",
+                                        "subbands": [
+                                            96,
+                                            104,
+                                            106,
+                                            110,
                                             117,
-                                            118,
-                                            119,
-                                            120,
                                             121,
-                                            122,
-                                            123,
-                                            124,
-                                            125,
                                             126,
-                                            127,
-                                            128,
-                                            129,
-                                            130,
                                             131,
-                                            132,
-                                            133,
-                                            134,
-                                            135,
                                             136,
-                                            137,
-                                            138,
-                                            139,
-                                            140,
                                             141,
-                                            142,
-                                            143,
-                                            144,
-                                            145,
                                             146,
-                                            147,
-                                            148,
-                                            149,
                                             150,
-                                            151,
-                                            152,
-                                            153,
-                                            154,
-                                            155,
                                             156,
-                                            157,
-                                            158,
-                                            159,
-                                            160,
                                             161,
-                                            162,
-                                            163,
-                                            164,
-                                            165,
-                                            166,
-                                            167,
-                                            168,
-                                            169,
-                                            170,
-                                            171,
                                             172,
-                                            173,
-                                            174,
-                                            175,
-                                            176,
-                                            177,
                                             178,
-                                            179,
-                                            180,
-                                            181,
-                                            182,
                                             183,
-                                            184,
-                                            185,
-                                            186,
-                                            187,
-                                            188,
                                             189,
-                                            190,
-                                            191,
-                                            192,
-                                            193,
                                             194,
-                                            195,
-                                            196,
-                                            197,
-                                            198,
-                                            199,
-                                            200,
                                             201,
-                                            202,
-                                            203,
-                                            204,
-                                            205,
                                             206,
-                                            207,
-                                            208,
-                                            209,
-                                            210,
                                             211,
-                                            212,
-                                            213,
-                                            214,
-                                            215,
                                             216,
-                                            217,
-                                            218,
-                                            219,
-                                            220,
                                             221,
-                                            222,
-                                            223,
-                                            224,
-                                            225,
-                                            226,
-                                            227,
-                                            228,
-                                            229,
-                                            230,
-                                            231,
                                             232,
-                                            233,
-                                            234,
-                                            235,
-                                            236,
                                             237,
-                                            238,
-                                            239,
-                                            240,
-                                            241,
-                                            242,
-                                            243,
                                             244,
-                                            245,
-                                            246,
-                                            247,
-                                            248,
                                             249,
-                                            250,
-                                            251,
-                                            252,
-                                            253,
-                                            254,
                                             255,
-                                            256,
-                                            257,
-                                            258,
-                                            259,
-                                            260,
-                                            261,
-                                            262,
                                             263,
-                                            264,
-                                            265,
-                                            266,
-                                            267,
-                                            268,
                                             269,
-                                            270,
-                                            271,
-                                            272,
-                                            273,
                                             274,
-                                            275,
-                                            276,
-                                            277,
-                                            278,
                                             279,
-                                            280,
-                                            281,
-                                            282,
                                             283,
-                                            284,
-                                            285,
-                                            286,
-                                            287,
-                                            288,
-                                            289,
-                                            290,
-                                            291,
-                                            292,
-                                            293,
-                                            294,
                                             295,
-                                            296,
-                                            297,
-                                            298,
-                                            299,
                                             300,
-                                            301,
                                             302,
-                                            303,
-                                            304,
-                                            305,
-                                            306,
-                                            307,
-                                            308,
-                                            309,
-                                            310,
-                                            311,
                                             312,
-                                            313,
-                                            314,
-                                            315,
                                             316,
-                                            317,
-                                            318,
-                                            319,
                                             320,
-                                            321,
-                                            322,
-                                            323,
-                                            324,
-                                            325,
-                                            326,
-                                            327,
                                             328,
-                                            329,
                                             330,
-                                            331,
-                                            332,
                                             333,
-                                            334,
-                                            335,
-                                            336,
-                                            337,
                                             338,
-                                            339,
                                             340,
-                                            341,
-                                            342,
-                                            343,
-                                            344,
-                                            345,
-                                            346,
                                             347,
-                                            348,
-                                            349,
-                                            350,
                                             351,
-                                            352,
-                                            353,
-                                            354,
-                                            355,
                                             356,
-                                            357,
-                                            358,
-                                            359,
                                             360,
-                                            361,
-                                            362,
-                                            363,
-                                            364,
-                                            365,
                                             366,
-                                            367,
-                                            368,
-                                            369,
                                             370,
-                                            371,
-                                            372,
-                                            373,
-                                            374,
-                                            375,
                                             376,
-                                            377,
-                                            378,
-                                            379,
                                             380,
-                                            381,
-                                            382,
-                                            383,
-                                            384,
                                             385,
-                                            386,
-                                            387,
-                                            388,
                                             389,
-                                            390,
                                             391,
-                                            392,
-                                            393,
                                             394,
-                                            395,
-                                            396,
-                                            397,
-                                            398,
-                                            399,
                                             400,
-                                            401,
-                                            402,
-                                            403,
                                             404,
-                                            405,
-                                            406,
-                                            407,
-                                            408,
-                                            409,
-                                            410,
-                                            411,
-                                            412,
-                                            413,
-                                            414,
-                                            415,
-                                            416,
-                                            417,
-                                            418,
-                                            419,
-                                            420,
-                                            421,
-                                            422,
-                                            423,
-                                            424,
-                                            425,
-                                            426,
-                                            427,
-                                            428,
-                                            429,
-                                            430,
-                                            431,
-                                            432,
-                                            433,
-                                            434,
-                                            435,
-                                            436,
-                                            437,
-                                            438,
-                                            439,
-                                            440,
-                                            441,
-                                            442,
-                                            443,
-                                            444,
-                                            445,
-                                            446,
-                                            447,
-                                            448,
-                                            449,
-                                            450
+                                            410
                                         ]
                                     }
                                 ],
-                                "antenna_set": "HBA_DUAL_INNER",
-                                "filter": "HBA_110_190",
+                                "antenna_set": "LBA_OUTER",
+                                "filter": "LBA_10_90",
                                 "station_groups": [
                                     {
                                         "max_nr_missing": 4,
@@ -60391,93 +74706,121 @@
                                             "CS028",
                                             "CS030",
                                             "CS031",
-                                            "CS032",
                                             "CS101",
                                             "CS103",
                                             "CS201",
                                             "CS301",
                                             "CS302",
                                             "CS401",
-                                            "CS501"
+                                            "CS501",
+                                            "RS106",
+                                            "RS205",
+                                            "RS208",
+                                            "RS305",
+                                            "RS306",
+                                            "RS307",
+                                            "RS406",
+                                            "RS407",
+                                            "RS409",
+                                            "RS503"
                                         ]
                                     }
                                 ],
                                 "tile_beam": {
-                                    "angle1": 0.92934186635,
-                                    "angle2": 0.952579228492,
+                                    "angle1": 0.6624317181687094,
+                                    "angle2": 1.5579526427549426,
                                     "direction_type": "J2000",
-                                    "target": "Baaaa+bb"
+                                    "target": "_target_name_"
                                 }
                             }
                         },
                         "specifications_template": {
-                            "name": "beamforming observation",
-                            "version": 8
+                            "name": "parallel calibrator target and beamforming observation",
+                            "version": 5
                         }
                     },
-                    "PT Pipeline": {
-                        "description": "Pulsar Pipeline for default HBA pulsar timing observation. HBA. Full Core, 8bit, XXYY, 1ch/sub, Nsubs=400",
-                        "short_description": "Baaaa+bb/PULP",
+                    "Ingest": {
+                        "description": "",
+                        "short_description": "",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "ingest",
+                            "version": 4
+                        }
+                    },
+                    "Preprocessing of Calibrator": {
+                        "description": "Preprocessing of Calibrator for beamformed + imaging observation. 195kHz, 0.17s.",
+                        "short_description": "_Cal_/1.0/CPT",
                         "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 16,
+                                "time_steps": 1
+                            },
                             "cluster_resources": {
                                 "cores_per_task": 2,
-                                "parallel_tasks": 20,
+                                "parallel_tasks": 110,
                                 "where": {
                                     "cluster": "CEP4",
                                     "partition": "cpu"
                                 }
                             },
-                            "dspsr": {
-                                "digifil": {
-                                    "channels_per_part": 20,
-                                    "coherent_dedispersion": false,
-                                    "dm": 0,
-                                    "integration_time_factor": 4
-                                },
-                                "enabled": true,
-                                "optimise_period_dm": false,
-                                "rfi_excision": true,
-                                "subintegration_length": 10
+                            "demix": {
+                                "frequency_steps": 16,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
                             },
-                            "output": {
-                                "dynamic_spectrum": {
-                                    "enabled": false,
-                                    "time_average": 0.5
-                                },
-                                "quantisation": {
-                                    "enabled": false,
-                                    "scale": 5
-                                }
+                            "flag": {
+                                "autocorrelations": false,
+                                "outerchannels": true,
+                                "rfi_strategy": "none"
                             },
-                            "presto": {
-                                "fold_profile": true,
-                                "input": {
-                                    "decode_sigma": 3,
-                                    "nr_blocks": 100,
-                                    "samples_per_block": 8192
-                                },
-                                "prepfold": false,
-                                "rrats": {
-                                    "dm_range": 5,
-                                    "enabled": false
+                            "storagemanager": "dysco"
+                        },
+                        "specifications_template": {
+                            "name": "preprocessing pipeline",
+                            "version": 5
+                        }
+                    },
+                    "Preprocessing of Target": {
+                        "description": "Preprocessing of Target Sun for beamformed + imaging observation. No flagging. 195kHz, 0.17s",
+                        "short_description": "Sun/1.0/TP",
+                        "specifications_doc": {
+                            "average": {
+                                "frequency_steps": 16,
+                                "time_steps": 1
+                            },
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 110,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
                                 }
                             },
-                            "pulsar": {
-                                "name": "",
-                                "strategy": "meta"
+                            "demix": {
+                                "frequency_steps": 16,
+                                "ignore_target": false,
+                                "sources": [],
+                                "time_steps": 10
                             },
-                            "single_pulse_search": false
+                            "flag": {
+                                "autocorrelations": false,
+                                "outerchannels": true,
+                                "rfi_strategy": "none"
+                            },
+                            "storagemanager": "dysco"
                         },
                         "specifications_template": {
-                            "name": "pulsar pipeline",
-                            "version": 6
+                            "name": "preprocessing pipeline",
+                            "version": 5
                         }
                     }
                 }
             },
-            "version": 1,
-            "id": 59,
-            "state_value": "development",
+            "version": 14,
+            "id": 70,
+            "state_value": "legacy",
             "purpose_value": "technical_commissioning"
         },
         {
@@ -60488,7 +74831,7 @@
                 "name": "scheduling unit",
                 "version": 8
             },
-            "state": "legacy",
+            "state": "active",
             "template": {
                 "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
                 "parameters": [
@@ -60700,7 +75043,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60719,7 +75062,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60742,7 +75085,7 @@
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60765,7 +75108,7 @@
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60784,7 +75127,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60803,7 +75146,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60822,7 +75165,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60841,7 +75184,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60860,7 +75203,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60883,7 +75226,7 @@
                         },
                         "selection_template": {
                             "name": "SAP",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60902,7 +75245,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60921,7 +75264,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60940,7 +75283,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60959,7 +75302,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60978,7 +75321,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -60997,7 +75340,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     },
                     {
@@ -61016,7 +75359,7 @@
                         "selection_doc": {},
                         "selection_template": {
                             "name": "all",
-                            "version": 4
+                            "version": 6
                         }
                     }
                 ],
@@ -61042,20 +75385,17 @@
                     {
                         "first": "IM+BF",
                         "placement": "parallel",
-                        "second": "BF 1 station HBA",
-                        "time_offset": 0
+                        "second": "BF 1 station HBA"
                     },
                     {
                         "first": "IM+BF",
                         "placement": "parallel",
-                        "second": "BF 1 station LBA",
-                        "time_offset": 0
+                        "second": "BF 1 station LBA"
                     },
                     {
                         "first": "IM+BF",
                         "placement": "parallel",
-                        "second": "FE 1",
-                        "time_offset": 0
+                        "second": "FE 1"
                     }
                 ],
                 "tasks": {
@@ -61983,7 +76323,7 @@
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "BF 1 station LBA": {
@@ -63430,7 +77770,7 @@
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "Cleanup": {
@@ -63439,7 +77779,7 @@
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "cleanup",
-                            "version": 4
+                            "version": 7
                         }
                     },
                     "FE 1": {
@@ -63985,7 +78325,7 @@
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "FE 2": {
@@ -64531,7 +78871,7 @@
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "FE 3": {
@@ -65077,7 +79417,7 @@
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "FE 4": {
@@ -65623,7 +79963,7 @@
                         },
                         "specifications_template": {
                             "name": "beamforming observation",
-                            "version": 6
+                            "version": 8
                         }
                     },
                     "IM+BF": {
@@ -65951,7 +80291,7 @@
                         "specifications_doc": {},
                         "specifications_template": {
                             "name": "ingest",
-                            "version": 4
+                            "version": 7
                         }
                     },
                     "Preprocessing of Calibrator": {
@@ -65985,7 +80325,7 @@
                         },
                         "specifications_template": {
                             "name": "preprocessing pipeline",
-                            "version": 5
+                            "version": 8
                         }
                     },
                     "Preprocessing of Target": {
@@ -66019,27 +80359,27 @@
                         },
                         "specifications_template": {
                             "name": "preprocessing pipeline",
-                            "version": 5
+                            "version": 8
                         }
                     }
                 }
             },
-            "version": 14,
-            "id": 60,
-            "state_value": "legacy",
+            "version": 15,
+            "id": 71,
+            "state_value": "active",
             "purpose_value": "technical_commissioning"
         },
         {
             "description": "Solar observing strategy. Imaging + Beamformed observation on the Sun and a calibrator with 127 tied-array beams and a preprocessing pipeline for each SAP. In parallel single station BF spectra in LBA and HBA and 4 consecutive FE observations.",
             "name": "Solar Campaign",
-            "purpose": "technical_commissioning",
+            "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 8
+                "version": 5
             },
-            "state": "active",
+            "state": "legacy",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/8/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations - BF 1 station HBA",
@@ -71561,7 +85901,7 @@
                                 "outerchannels": true,
                                 "rfi_strategy": "none"
                             },
-                            "storagemanager": "dysco"
+                            "storagemanager": "standard"
                         },
                         "specifications_template": {
                             "name": "preprocessing pipeline",
@@ -71570,10 +85910,10 @@
                     }
                 }
             },
-            "version": 15,
-            "id": 61,
-            "state_value": "active",
-            "purpose_value": "technical_commissioning"
+            "version": 16,
+            "id": 72,
+            "state_value": "legacy",
+            "purpose_value": "production"
         },
         {
             "description": "Solar observing strategy. Imaging + Beamformed observation on the Sun and a calibrator with 127 tied-array beams and a preprocessing pipeline for each SAP. In parallel single station BF spectra in LBA and HBA and 4 consecutive FE observations.",
@@ -71581,11 +85921,11 @@
             "purpose": "production",
             "scheduling_unit_template": {
                 "name": "scheduling unit",
-                "version": 5
+                "version": 10
             },
             "state": "active",
             "template": {
-                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/5/ref_resolved",
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
                 "parameters": [
                     {
                         "name": "Stations - BF 1 station HBA",
@@ -71756,9 +86096,11 @@
                     "scheduler": "dynamic",
                     "sky": {
                         "min_distance": {
-                            "jupiter": 0,
-                            "moon": 0,
-                            "sun": 0
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0,
+                                "sun": 0
+                            }
                         },
                         "min_elevation": {
                             "calibrator": 0.1745329252,
@@ -71776,7 +86118,7 @@
                 },
                 "scheduling_constraints_template": {
                     "name": "constraints",
-                    "version": 7
+                    "version": 11
                 },
                 "task_relations": [
                     {
@@ -77034,7 +91376,7 @@
                         },
                         "specifications_template": {
                             "name": "parallel calibrator target and beamforming observation",
-                            "version": 5
+                            "version": 6
                         }
                     },
                     "Ingest": {
@@ -77116,10 +91458,504 @@
                     }
                 }
             },
-            "version": 16,
-            "id": 62,
+            "version": 17,
+            "id": 73,
             "state_value": "active",
             "purpose_value": "production"
+        },
+        {
+            "description": "Observation recording cross-correlation statistics for station calibration purposes.",
+            "name": "Station Calibration",
+            "purpose": "system_health",
+            "scheduling_unit_template": {
+                "name": "scheduling unit",
+                "version": 10
+            },
+            "state": "development",
+            "template": {
+                "$schema": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/10/ref_resolved",
+                "parameters": [
+                    {
+                        "name": "Stations",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/station_groups"
+                        ]
+                    },
+                    {
+                        "name": "Scheduling Constraints",
+                        "refs": [
+                            "#/scheduling_constraints_doc"
+                        ]
+                    },
+                    {
+                        "name": "Duration",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/duration"
+                        ]
+                    },
+                    {
+                        "name": "Observation Short Description",
+                        "refs": [
+                            "#/tasks/Observation/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Pipeline Short Description",
+                        "refs": [
+                            "#/tasks/Pipeline/short_description"
+                        ]
+                    },
+                    {
+                        "name": "Target Pointing",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+                            "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+                        ]
+                    },
+                    {
+                        "name": "Subbands",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/subbands"
+                        ]
+                    },
+                    {
+                        "name": "Filter",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/filter"
+                        ]
+                    },
+                    {
+                        "name": "Antenna Set",
+                        "refs": [
+                            "#/tasks/Observation/specifications_doc/station_configuration/antenna_set"
+                        ]
+                    },
+                    {
+                        "name": "Enable full output for HBA",
+                        "refs": [
+                            "#/tasks/Pipeline/specifications_doc/settings/full_hba_output"
+                        ]
+                    }
+                ],
+                "scheduling_constraints_doc": {
+                    "scheduler": "dynamic",
+                    "sky": {
+                        "min_distance": {
+                            "target": {
+                                "jupiter": 0,
+                                "moon": 0.00872665,
+                                "sun": 0.00872665
+                            }
+                        },
+                        "transit_offset": {
+                            "from": -21600,
+                            "to": 21600
+                        }
+                    }
+                },
+                "scheduling_constraints_template": {
+                    "name": "constraints",
+                    "version": 11
+                },
+                "task_relations": [
+                    {
+                        "consumer": "Pipeline",
+                        "input": {
+                            "dataformat": "QA_Statistics_HDF5",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "QA_Statistics_HDF5",
+                            "datatype": "quality",
+                            "role": "qa"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 9
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "QA_Statistics_HDF5",
+                            "datatype": "quality",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "QA_Statistics_HDF5",
+                            "datatype": "quality",
+                            "role": "qa"
+                        },
+                        "producer": "Observation",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 9
+                        }
+                    },
+                    {
+                        "consumer": "Cleanup",
+                        "input": {
+                            "dataformat": "station calibration table",
+                            "datatype": "station calibration",
+                            "role": "any"
+                        },
+                        "output": {
+                            "dataformat": "station calibration table",
+                            "datatype": "station calibration",
+                            "role": "any"
+                        },
+                        "producer": "Pipeline",
+                        "selection_doc": {},
+                        "selection_template": {
+                            "name": "all",
+                            "version": 9
+                        }
+                    }
+                ],
+                "task_scheduling_relations": [],
+                "tasks": {
+                    "Cleanup": {
+                        "description": "Cleanup all dataproducts from disk",
+                        "specifications_doc": {},
+                        "specifications_template": {
+                            "name": "cleanup",
+                            "version": 7
+                        }
+                    },
+                    "Observation": {
+                        "description": "Target observation for station calibration. !!! todo: check that this is the right kind!",
+                        "short_description": "_Target_Name_",
+                        "specifications_doc": {
+                            "QA": {
+                                "file_conversion": {
+                                    "enabled": false,
+                                    "nr_of_subbands": -1,
+                                    "nr_of_timestamps": 256
+                                },
+                                "inspection_plots": "msplots",
+                                "plots": {
+                                    "autocorrelation": true,
+                                    "crosscorrelation": true,
+                                    "enabled": false
+                                }
+                            },
+                            "correlator": {
+                                "channels_per_subband": 64,
+                                "integration_time": 1,
+                                "storage_cluster": "CEP4"
+                            },
+                            "duration": 28800,
+                            "station_configuration": {
+                                "SAPs": [
+                                    {
+                                        "digital_pointing": {
+                                            "angle1": 5.233686580728538,
+                                            "angle2": 0.7109409496854693,
+                                            "direction_type": "J2000",
+                                            "target": "CygA"
+                                        },
+                                        "name": "target",
+                                        "subbands": [
+                                            104,
+                                            105,
+                                            106,
+                                            107,
+                                            108,
+                                            109,
+                                            110,
+                                            111,
+                                            112,
+                                            113,
+                                            114,
+                                            115,
+                                            116,
+                                            117,
+                                            118,
+                                            119,
+                                            120,
+                                            121,
+                                            122,
+                                            123,
+                                            124,
+                                            125,
+                                            126,
+                                            127,
+                                            128,
+                                            129,
+                                            130,
+                                            131,
+                                            132,
+                                            133,
+                                            134,
+                                            135,
+                                            136,
+                                            138,
+                                            139,
+                                            140,
+                                            141,
+                                            142,
+                                            143,
+                                            144,
+                                            145,
+                                            146,
+                                            147,
+                                            148,
+                                            149,
+                                            150,
+                                            151,
+                                            152,
+                                            153,
+                                            154,
+                                            155,
+                                            156,
+                                            157,
+                                            158,
+                                            159,
+                                            160,
+                                            161,
+                                            162,
+                                            163,
+                                            165,
+                                            166,
+                                            167,
+                                            168,
+                                            169,
+                                            170,
+                                            171,
+                                            172,
+                                            173,
+                                            174,
+                                            175,
+                                            176,
+                                            177,
+                                            178,
+                                            179,
+                                            180,
+                                            182,
+                                            183,
+                                            184,
+                                            187,
+                                            188,
+                                            189,
+                                            190,
+                                            191,
+                                            192,
+                                            193,
+                                            194,
+                                            195,
+                                            196,
+                                            197,
+                                            198,
+                                            199,
+                                            200,
+                                            201,
+                                            202,
+                                            203,
+                                            204,
+                                            205,
+                                            206,
+                                            207,
+                                            208,
+                                            209,
+                                            212,
+                                            213,
+                                            215,
+                                            216,
+                                            217,
+                                            218,
+                                            219,
+                                            220,
+                                            221,
+                                            222,
+                                            223,
+                                            224,
+                                            225,
+                                            226,
+                                            227,
+                                            228,
+                                            229,
+                                            230,
+                                            231,
+                                            232,
+                                            233,
+                                            234,
+                                            235,
+                                            236,
+                                            237,
+                                            238,
+                                            239,
+                                            240,
+                                            242,
+                                            243,
+                                            244,
+                                            245,
+                                            246,
+                                            247,
+                                            248,
+                                            249,
+                                            250,
+                                            251,
+                                            252,
+                                            253,
+                                            254,
+                                            255,
+                                            257,
+                                            258,
+                                            259,
+                                            260,
+                                            261,
+                                            262,
+                                            263,
+                                            264,
+                                            265,
+                                            266,
+                                            267,
+                                            268,
+                                            269,
+                                            270,
+                                            271,
+                                            272,
+                                            273,
+                                            275,
+                                            276,
+                                            277,
+                                            278,
+                                            279,
+                                            280,
+                                            281,
+                                            282,
+                                            283,
+                                            284,
+                                            285,
+                                            286,
+                                            287,
+                                            288,
+                                            289,
+                                            290,
+                                            291,
+                                            292,
+                                            293,
+                                            294,
+                                            295,
+                                            296,
+                                            297,
+                                            298,
+                                            299,
+                                            300,
+                                            302,
+                                            303,
+                                            304,
+                                            305,
+                                            306,
+                                            307,
+                                            308,
+                                            309,
+                                            310,
+                                            311,
+                                            312,
+                                            313,
+                                            314,
+                                            315,
+                                            316,
+                                            317,
+                                            318,
+                                            319,
+                                            320,
+                                            321,
+                                            322,
+                                            323,
+                                            324,
+                                            325,
+                                            326,
+                                            327,
+                                            328,
+                                            330,
+                                            331,
+                                            332,
+                                            333,
+                                            334,
+                                            335,
+                                            336,
+                                            337,
+                                            338,
+                                            339,
+                                            340,
+                                            341,
+                                            342,
+                                            343,
+                                            344,
+                                            345,
+                                            346,
+                                            347,
+                                            349,
+                                            364,
+                                            372,
+                                            380,
+                                            388,
+                                            396,
+                                            404,
+                                            413,
+                                            421,
+                                            430,
+                                            438,
+                                            447
+                                        ]
+                                    }
+                                ],
+                                "antenna_set": "HBA_DUAL",
+                                "filter": "HBA_110_190",
+                                "station_groups": [
+                                    {
+                                        "max_nr_missing": 0,
+                                        "stations": [
+                                            "CS001"
+                                        ]
+                                    }
+                                ],
+                                "tile_beam": {
+                                    "angle1": 5.233686580728538,
+                                    "angle2": 0.7109409496854693,
+                                    "direction_type": "J2000",
+                                    "target": "CygA"
+                                }
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "target observation",
+                            "version": 9
+                        }
+                    },
+                    "Pipeline": {
+                        "description": "Station Calibration Pipeline",
+                        "short_description": "CygA/StationCal",
+                        "specifications_doc": {
+                            "cluster_resources": {
+                                "cores_per_task": 2,
+                                "parallel_tasks": 20,
+                                "where": {
+                                    "cluster": "CEP4",
+                                    "partition": "cpu"
+                                }
+                            },
+                            "settings": {
+                                "full_hba_output": true
+                            }
+                        },
+                        "specifications_template": {
+                            "name": "station calibration pipeline",
+                            "version": 1
+                        }
+                    }
+                }
+            },
+            "version": 1,
+            "id": 74,
+            "state_value": "development",
+            "purpose_value": "system_health"
         }
     ]
 }
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTable.js
deleted file mode 100644
index e1e3b03ed63af0cfd0810ca62ec347297c829296..0000000000000000000000000000000000000000
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTable.js
+++ /dev/null
@@ -1,2950 +0,0 @@
-// file is Depredicated and will be removed as soon as ViewTableExt transformation has been completed.
-
-import PropTypes from 'prop-types';
-import React, { useRef, useState } from "react";
-import {  useFlexLayout , useResizeColumns, useSortBy, useTable, useFilters, useGlobalFilter, useAsyncDebounce, usePagination, useRowSelect, useColumnOrder } from 'react-table'
-import  {matchSorter} from 'match-sorter'
-import _ from 'lodash';
-import moment from 'moment';
-import { useHistory, Link } from "react-router-dom";
-import { OverlayPanel } from 'primereact/overlaypanel';
-import { InputMask } from 'primereact/inputmask';
-import { InputText } from 'primereact/inputtext';
-import { Calendar } from 'primereact/calendar';
-import { Paginator } from 'primereact/paginator';
-import { TriStateCheckbox } from 'primereact/tristatecheckbox';
-import { Slider } from 'primereact/slider';
-import { Button } from "primereact/button";
-import { InputNumber } from "primereact/inputnumber";
-import { MultiSelect } from 'primereact/multiselect';
-import { RadioButton } from 'primereact/radiobutton';
-import { useExportData } from "react-table-plugins";
-import { ProgressBar } from 'primereact/progressbar';
-import { Dropdown } from 'primereact/dropdown';
-
-import "flatpickr/dist/flatpickr.css";
-import Flatpickr from "react-flatpickr";
-import confirmDatePlugin from "flatpickr/dist/plugins/confirmDate/confirmDate";
-import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
-import UtilService from '../../../src/services/util.service'
-import Papa from "papaparse";
-import JsPDF from "jspdf";
-import "jspdf-autotable";
-import TableUtil from "../../utils/table.util";
-import {Validator}  from  "@astron-sd/telescope-specification"
-
-
-let tblinstance;
-let tableInstanceRef;
-let doServersideFilter = false;
-let tbldata = [], filteredData = [];
-let data = [];
-let selectedRows = [];
-let isunittest = false;
-let showTopTotal = true;
-let showGlobalFilter = true;
-let showColumnFilter = true;
-let allowColumnSelection = true;
-let showTopComponents = true;
-let allowRowSelection = false;
-let isOnlySingleRowAllowed = false;
-let showTopPagination = false;
-let parentCallbackFunction, parentCBonSelection;
-let showCSV = false;
-let showActionInNewTab = false;
-let multiSelectOption = {};
-let filterCallback = null;
-let clearAllFuncCallback = null;
-let tableOptionsState = null;
-let tableToolTipsState = {};
-let setLoaderFunction = null;
-let showFilterOption = null;
-let hasFilters = false;
-let loadingStatus = false;
-let tmpTableData = null;
-let currentTableName = null;
-let storeFilter = false;
-
-
-
-// THis Class is a target for Refactoring. We should default to PrimeReact Datatable.
-// Define a default UI for filtering
-let fixedColumns = ['Select', 'Action', 'Status Logs', 'View Summary'];
-
-const getItemStyle = ({ isDragging, isDropAnimating }, draggableStyle) => ({
-  ...draggableStyle,
-  // some basic styles to make the items look a bit nicer
-  userSelect: "none",
-  cursor: isDragging? 'move': 'default',
-  ...(!isDragging && { transform: "translate(0,0)" }),
-  ...(isDropAnimating && { transitionDuration: "0.001s" })
-
-  // styles we need to apply on draggables
-});
-
-function GlobalFilter({
-  globalFilter,
-  setGlobalFilter,
-}) {
-  const [value, setValue] = React.useState(globalFilter)
-  const onChange = useAsyncDebounce(value => { setGlobalFilter(value || undefined) }, 200)
-  return (
-    <span style={{ marginLeft: "-10px" }}>
-      <input
-        value={value || ""}
-        onChange={e => {
-          setValue(e.target.value);
-          onChange(e.target.value);
-        }}
-      /> {" "}<i className="fa fa-search"></i>
-    </span>
-  )
-}
-
-GlobalFilter.propTypes = {
-  globalFilter: PropTypes.any,
-  setGlobalFilter: PropTypes.func
-}
-
-// Define a default UI for filtering
-function DefaultColumnFilter({
-  column: { filterValue,  setFilter,  Header },
-}) {
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue('');  
-      setPrevTable(currentTableName);   
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if (filterValue) {
-          setFiltered(true);
-      }
-      if(!value){
-          setValue(filterValue);
-          setFilter(filterValue);
-      }
-    }
-  }, [filterValue, value, currentTableName]); 
-  
-  // Function to call the server side filtering
-  const callServerFilter = (event, isCleared) => {
-      hasFilters = true;
-      if (isCleared) {
-          hasFilters = false;
-          if (filtered) {
-              _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-              filterCallback(tableOptionsState, setLoaderFunction);
-          }
-      }   else {
-          filterCallback(tableOptionsState, setLoaderFunction);
-      }
-  }; 
-  return (
-
-        <div className="table-filter"  style={{marginRight: '5px'}}>
-            <input 
-              title={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter few characters and press ‘Enter’ key to search"}
-              value={value}   //***TO REMOVE - INCOMING CHANGE WAS value={filterValue || ''}
-              onChange={e => {
-                setValue(e.target.value);
-                setFilter(e.target.value || undefined) // Set undefined to remove the filter entirely
-                if(storeFilter) {
-                  TableUtil.saveFilter(currentTableName, Header, e.target.value);
-                }
-              }}
-              onKeyUp={(e) => {
-                if (e.key === "Enter" && doServersideFilter) {
-                  setFiltered(true);
-                  callServerFilter(e);
-                }
-              }}
-            />
-            {value && 
-              <i className="table-reset pi pi-times" style={{cursor: 'pointer'}}
-                title="Clear the filter"
-                onClick={(e) => {
-                  setFilter(undefined); setValue(''); setFiltered(false);
-                  if (doServersideFilter) {
-                    setFilter(undefined); 
-                    setValue('');
-                    callServerFilter(e, true);
-                  }
-                  if(storeFilter){
-                    TableUtil.saveFilter(currentTableName, Header, '');
-                  }
-                }} />
-            }
-        </div>
-             
-
-  )
-}
-
-
-/* 
-Generate and download csv 
-*/
-function getExportFileBlob({ columns, data, fileType, fileName }) {
-  if (fileType === "csv") {
-    // CSV download
-    const headerNames = columns.map((col) => col.exportValue);
-    // remove actionpath column in csv export
-    let  index = headerNames.indexOf('actionpath');
-    if (index > -1) {
-      headerNames.splice(index, 1);
-    }
-    // Convert the object to string
-    let cvsData = [];
-    let tmpRow = [];
-    let tmpCell = '';
-    data.forEach(csvData =>{
-      tmpRow = [];
-      csvData.forEach(csvCell => {
-        tmpCell = '';
-        if (csvCell && typeof csvCell === 'object') {
-            if (csvCell.props.children && typeof csvCell.props.children  === 'object') {
-              csvCell.props.children.forEach(obj => {
-                tmpCell = tmpCell+(tmpCell.length>0?', ':'')+obj.props.children;
-              });
-              tmpCell = tmpCell.toString();
-            }  else {
-              tmpCell = csvCell.props.children?csvCell.props.children.toString():'';
-            }
-        } else {
-          tmpCell = csvCell || '';
-        }
-        tmpRow.push(tmpCell);
-      });
-      cvsData.push(tmpRow);
-    });
-    data = cvsData;
-    const csvString = Papa.unparse({ fields: headerNames, data });
-    return new Blob([csvString], { type: "text/csv" });
-  } //PDF download
-  else if (fileType === "pdf") {
-    const headerNames = columns.map((column) => column.exportValue);
-    const doc = new JsPDF();
-    let index = headerNames.indexOf('Action');
-    if (index > -1) {
-      headerNames.splice(index, 1);
-    }
-    doc.autoTable({
-      head: [headerNames],
-      body: data,
-    });
-    doc.save(`${fileName}.pdf`);
-    return false;
-  }
-}
-
-/**
- * Custom filter UI for selecting a unique option from a list.
- * option values are getting from  callback funtion or from the table data.
- * @param {*} param0 
- * @returns 
- */
-function SelectColumnFilter({
-  column: { filterValue, setFilter, preFilteredRows, id, Header },
-}) {
-  const [value, setValue] = useState('');
-  const [rowData, setRowData] = useState(null);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue('');
-      setPrevTable(currentTableName);  
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      setValue(filterValue);
-      setFilter(filterValue);
-    }
-  }, [filterValue, value, currentTableName]);
-
-  const options = React.useMemo(() => {
-    let options = null;
-    if (showFilterOption) {
-      options = new Set(showFilterOption(id));
-    } 
-    if (options === null || options.size === 0) {
-      options = new Set();
-      if (preFilteredRows || rowData) {
-          preFilteredRows = preFilteredRows || rowData;
-          setRowData(preFilteredRows);
-          preFilteredRows.forEach(row => {
-            if(row.values[id]!==null && row.values[id]!==undefined) {
-              let value = String(row.values[id]);
-              options.add(value)
-            }
-          });
-      }
-    } 
-    let cleanoptions = [...new Set(options.values())];
-     cleanoptions = [...new Set(cleanoptions)];
-
-    return cleanoptions;
-  }, [id, preFilteredRows]);
-
-  // Function to call the server side filtering
-  const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-    if (isCleared) {
-        hasFilters = false;
-            filterCallback(tableOptionsState, setLoaderFunction);
-    }   else {
-        tableOptionsState.filters.push({id: Header, value: event.target.value});
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-  };
-
-  // Render a multi-select box
-  return (
-    <div  >
-      <select
-        title={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select a value from list to search"}
-        style={{
-          height: '24.2014px',
-          border: '1px solid lightgrey',
-        }}
-        value={value}
-        onChange={e => {
-          setValue(e.target.value);
-          setFilter(e.target.value || undefined);
-          if (doServersideFilter) {
-            if (e.target.value === '' || e.target.value === 'All') {
-              hasFilters = false;
-              setFilter(undefined); 
-              setValue('');
-              callServerFilter(e, true);
-            } else {
-              callServerFilter(e, false);
-            }
-          }
-          if(storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, e.target.value);
-          }
-        }}
-      >
-        <option value="">All</option>
-        {
-          options.map((option,index) => (
-          <option key={makekey(option+"_option_" + index)} value={option}>
-            {_.startCase(option)}
-          </option>
-        ))}
-      </select>
-    </div>
-  )
-}
-
-// Multi-Select Custom Filter and set unique options value
-function MultiSelectColumnFilter({
-  column: { filterValue, setFilter, preFilteredRows, id, Header },
-}) {
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [filtertype, setFiltertype] = useState('Any');
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue('');
-      setFiltertype('Any');
-      setPrevTable(currentTableName);   
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      const filterType = TableUtil.getFilter(currentTableName, 'stationFilterType');
-      if(filterValue && !value){
-        setValue(filterValue);
-        setFilter(filterValue);
-        setFiltertype(filterType);
-        multiSelectOption[Header] = filterType;
-      }
-    }
-  }, [filterValue, value, filtertype, currentTableName]);
-
-  // Set Any / All Filter type
-  const setSelectTypeOption = (option) => {
-    setFiltertype(option);
-    multiSelectOption[Header] = option
-    if (value !== '') {
-      if (storeFilter) {
-        TableUtil.saveFilter(currentTableName, 'stationFilterType', option);
-      }
-      setFilter(value);
-    }
-  };
-
-  /**
-   * Trigger server side data fetch in parent component
-   * @param {*} e 
-   */
-  function callSearchFunc(e) {
-    callServerFilter(e);
-  }
-
-  // Function to call the server side filtering
-  const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    tableOptionsState.filters.push({id: 'stationFilterType', value: filtertype});
-    if (isCleared) {
-        hasFilters = false;
-        if (filtered) {
-            _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-            filterCallback(tableOptionsState, setLoaderFunction);
-        }
-    }   else {
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-  };
-
-  multiSelectOption[Header] = filtertype;
-  const options = React.useMemo(() => {
-    let options = new Set();
-    if (showFilterOption) {
-      return showFilterOption(id);
-    } 
-    preFilteredRows.forEach(row => {
-      row.values[id].split(',').forEach(value => {
-        if (value !== '') {
-          let hasValue = false;
-          options.forEach(option => {
-            if (option.name === value) {
-              hasValue = true;
-            }
-          });
-          if (!hasValue) {
-            let option = { 'name': value, 'value': value };
-            options.add(option);
-          }
-        }
-      });
-    });
-
-    let cleanoptions = [...new Set(options.values())];
-    return cleanoptions;
-  }, [id, preFilteredRows]);
-
-  // Render a multi-select box
-  return (
-    <div  >
-      <div className="flex " >
-      <div className="p-field-radiobutton" style={{marginRight:"5px"}} >
-        <RadioButton inputId="filtertype1" name="filtertype" value="Any" 
-        onChange={(e) => setSelectTypeOption(e.value)} checked={filtertype === '' || filtertype === 'Any'} 
-        tooltip= "Search the row if the Station contains at least one of the selected value" />
-        <label htmlFor="filtertype1">Any</label>
-      </div>
-      <div className="p-field-radiobutton">
-        <RadioButton inputId="filtertype2" name="filtertype" value="All"  style={{verticalAlign:"top"}}
-        onChange={(e) => setSelectTypeOption(e.value)} checked={filtertype === 'All'} 
-        tooltip= "Search the row if the Station contains all of the selected value" />
-        <label htmlFor="filtertype2">All</label>
-      </div>
-      </div>
-         <div style={{ position: 'relative', display: 'flex'}} >
-        <MultiSelect data-testid="multi-select" id="multi-select" optionLabel="value" optionValue="value" filter={true}
-          value={value}
-          options={options}
-          onChange={e => {
-            setValue(e.target.value);
-            setFilter(e.target.value || undefined);
-            setFiltered(true);
-            if(storeFilter) {
-              if (e.target.value.length > 0) {
-                TableUtil.saveFilter(currentTableName, Header, e.target.value);
-                TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, filtertype);
-              } else {
-                TableUtil.clearColumnFilter(currentTableName, Header);
-                TableUtil.clearColumnFilter(currentTableName, `${Header}-FilterOption`);
-              }
-            }
-          }}
-          maxSelectedLabels="1"
-          selectedItemsLabel="{0} Selected"
-          className="multi-select"
-          tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select one or more value from list to search"}
-          style={{width: '95%'}}
-        />
-        {doServersideFilter &&
-            <button  className="p-link" onClick={callSearchFunc} >
-              <i className="pi pi-search search-btn" />
-            </button>
-        }
-      </div>
-    </div>
-  )
-}
-
-// Multi-Select Custom Filter and set unique options value
-function MultiSelectFilter({
-  column: { filterValue, setFilter, preFilteredRows, id, Header },
-}) {
-  const [value, setValue] = useState('');
-  const [filtertype, setFiltertype] = useState('Any');
-  const [filtered, setFiltered] = useState(false);
-  const [prevTable, setPrevTable] = useState('');
-
-  function callSearchFunc(e) {
-    callServerFilter(e);
-  }
-  
-  React.useEffect(() => {
-    
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue('');
-      setFiltertype('Any');
-      setPrevTable(currentTableName);   
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if(filterValue && !value){
-        setValue(filterValue);
-        setFilter(filterValue);
-      }
-    }
-  }, [filterValue, value, filtertype, currentTableName]);
-
-  multiSelectOption[Header] = filtertype;
-  const options = React.useMemo(() => {
-    let options = new Set();
-    if (showFilterOption) {
-      return showFilterOption(id);
-    } 
-    preFilteredRows.forEach(row => {
-      row.values[id].split(',').forEach(value => {
-        if (value !== '') {
-          let hasValue = false;
-          options.forEach(option => {
-            if (option.name === value) {
-              hasValue = true;
-            }
-          });
-          if (!hasValue) {
-            let option = { 'name': value, 'value': value };
-            options.add(option);
-          }
-        }
-      });
-    });
-    return [...options.values()]
-  }, [id, preFilteredRows]);
-
-    // Function to call the server side filtering
-    const callServerFilter = (event, isCleared) => {
-      hasFilters = true;
-      if (isCleared) {
-          hasFilters = false;
-          if (filtered) {
-              _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-              filterCallback(tableOptionsState, setLoaderFunction);
-          }
-      }   else {
-          filterCallback(tableOptionsState, setLoaderFunction);
-      }
-  }; 
-
-  // Render a multi-select box
-  return (
-    <div onClick={e => { e.stopPropagation()}} >
-      <div style={{ position: 'relative', display: 'flex'}} >
-          <MultiSelect data-testid="multi-select" id="multi-select" optionLabel="name" optionValue="value" filter //={!doServersideFilter}
-            value={value}
-            options={options}
-            onChange={e => {
-              setValue(e.target.value);
-              setFilter(e.target.value || undefined);
-              if(storeFilter) {
-                if (e.target.value.length > 0) {
-                  TableUtil.saveFilter(currentTableName, Header, e.target.value);
-                } else {
-                  TableUtil.clearColumnFilter(currentTableName, Header);
-                }
-              }
-             setFiltered(true);
-            }}
-            maxSelectedLabels="1"
-            selectedItemsLabel="{0} Selected"
-            className="multi-select"
-            tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select one or more value from list and click search icon to search"}
-            style={{width: '85%'}}
-          />
-        {doServersideFilter &&
-          <div>
-              <button  className="p-link" onClick={callSearchFunc} >
-                <i className="pi pi-search search-btn" />
-              </button>
-          </div>
-        }
-      </div>
-    </div>
-  )
-}
-
-// This is a custom filter UI that uses a
-// slider to set the filter value between a column's
-// min and max values
-function SliderColumnFilter({
-  column: { setFilter,  Header },
-}) {
-  // Calculate the min and max
-  // using the preFilteredRows
-  const [value, setValue] = useState(0);
-  
-  React.useEffect(() => {
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if (filterValue && !value) {
-        setValue(filterValue);
-        setFilter(filterValue);
-      }
-    }
-  });
-
-  return (
-    <div  className="table-slider">
-      <Slider value={value} 
-        onChange={(e) => { 
-          setFilter(e.value); setValue(e.value);
-          if (storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, e.value);
-          }
-        }}
-        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select range value to search"}
-      />
-    </div>
-  )
-}
-
-// This is a custom filter UI that uses a
-// switch to set the value
-function BooleanColumnFilter({
-  column: { setFilter, filterValue, Header },
-}) {
-  // Calculate the min and max
-  // using the preFilteredRows
-  const [value, setValue] = useState(null);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue(null);
-      setPrevTable(currentTableName);  
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if(filterValue && !value){
-        setValue(filterValue);
-        setFilter(filterValue);
-      }
-    }
-  }, [filterValue, value, currentTableName]);
-  // Function to call the server side filtering
-  const callServerFilter = (isCleared) => {
-    hasFilters = true;
-    _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-    if (isCleared) {
-        hasFilters = false;
-        tableOptionsState.filters.push({id: Header, value: true});
-        setValue(true);
-    } else if (isCleared != null) { 
-        setValue(false);
-        tableOptionsState.filters.push({id: Header, value: false});
-    }
-    filterCallback(tableOptionsState, setLoaderFunction);
-  };
-
-  return (
-    <div >
-      <TriStateCheckbox value={value} style={{ 'width': '15px', 'height': '24.2014px' }} 
-        onChange={(e) => {
-          setValue(e.target.value);
-          if(e.target.value === null) {
-            setFilter(undefined)
-          } else {
-            setFilter(e.target.value || false )
-          }         
-          if (storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, e.target.value);
-          }
-          if (doServersideFilter) {
-            callServerFilter(e.value);
-          }  
-        }}
-        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select checkbox (True/False/None) to search"}
-      />
-      
-    </div>
-    
-  )
-}
-
-
-// This is a custom filter UI that uses a
-// calendar range to set the value
-function DateRangeColumnFilter({
-  column: { setFilter, filterValue, Header },
-}) {
-  // Calculate the min and max
-  // using the preFilteredRows
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue(null);
-      setPrevTable(currentTableName);
-    }
-    
-    if (storeFilter) {
-      const filter = TableUtil.getFilter(currentTableName, Header);
-      const filterValue = _.map(filter, date => {return new Date(date)} )
-      if (filterValue[1] &&  !value ){
-        setValue(filterValue);
-        setFilter(filterValue);
-      }
-    }
-  }, [filterValue, value, currentTableName]);
-  // Function to call the server side filtering
-  const callServerFilter = (value, isCleared) => {
-    hasFilters = true;
-    if (isCleared) {
-        hasFilters = false;
-        if (filtered) {
-            _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-            filterCallback(tableOptionsState, setLoaderFunction);
-        }
-    }   else {
-      let filterColumn = _.find(tableOptionsState.filters, {id: Header });
-      if(filterColumn) {
-        filterColumn.value = value;
-        filterCallback(tableOptionsState, setLoaderFunction);
-      } else {
-        filterCallback(tableOptionsState, setLoaderFunction);
-      }
-    }
-  };
-  return (
-    <div className="table-filter" >
-      <Calendar selectionMode="range" value={filterValue} appendTo={document.body}
-        placeholder="Range"
-        onChange={(e) => {  
-          setValue(e.value);
-          setFilter(e.value);
-          if(storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, e.target.value);
-          }
-          if ((value !== '' && value !== 'Invalid date' ) && doServersideFilter) {
-            setFiltered(true);
-            callServerFilter(e.target.value);
-          }
-        }} 
-        showIcon></Calendar>
-      {value && <i onClick={(e) => { 
-        setFilter(undefined); setValue([]); setFiltered(false);
-        if(storeFilter){
-          TableUtil.saveFilter(currentTableName, Header, []  );
-        }
-        if (doServersideFilter) {
-          setFilter(undefined); 
-          setValue('');
-          callServerFilter(e.target.value, true);
-        } }} className="tb-cal-reset pi pi-times" />}
-    </div>
-  )
-}
-
-// This is a custom filter UI that uses a
-// flatpickr range calendar to set the value
-function FlatpickrRangeColumnFilter({
-  column: { setFilter, filterValue, Header },
-}) {
-    
-  
-  
-  
-  const [value, setValue] = useState('');
-    const [prevTable, setPrevTable] = useState('');
-    React.useEffect(() => {
-      if ((!filterValue && value) || prevTable !== currentTableName) {
-        setValue(null);
-        setPrevTable(currentTableName);
-      }
-      if (storeFilter) {
-        const filter = TableUtil.getFilter(currentTableName, Header);
-        try {
-        const filterValue = _.map(filter, date => {return new Date(date)} )
-        if (filter === '') {
-          TableUtil.saveFilter(currentTableName, Header, []  );
-          setFilter(undefined); 
-        }
-        if (filterValue &&  !value ){
-          setValue(filterValue);
-          setFilter(filterValue);
-          
-
-        }
-
-      }
-      catch(ex)
-      {
-        console.log("FlatpickrRangeColumnFilter",ex,filter)
-      }
-
-
-
-
-      }
-  }, [filterValue, value, currentTableName]);
-  // Function to call the server side filtering
-  const callServerFilter = (value, isCleared) => {
-      hasFilters = true;
-      if (isCleared) {
-          hasFilters = false;
-          _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-          filterCallback(tableOptionsState, setLoaderFunction);
-      }   else {
-          let filterColumn = _.find(tableOptionsState.filters, {id: Header });
-          if(filterColumn) {
-              filterColumn.value = value;
-              filterCallback(tableOptionsState, setLoaderFunction);
-          } else if (!filterColumn && value && value.length === 2) {
-              // Here the above condition placed because the Start/End time filters is not consistency in tableOptionsState.filters
-              filterColumn = {id: Header, value: value}
-              tableOptionsState.filters.push(filterColumn);
-              filterCallback(tableOptionsState, setLoaderFunction);
-          } else {
-              filterCallback(tableOptionsState, setLoaderFunction);
-          }
-    }
-  };
-  return (
-      <div className="table-filter"  >
-          <Flatpickr data-enable-time data-input className="flatpickr-range-filter"
-            options={{  "inlineHideInput": true,
-                        "wrap": true,
-                        "enableSeconds": true,
-                        "time_24hr": true,
-                        "minuteIncrement": 1,
-                        "allowInput": true,
-                        "mode": "range",
-                        "defaultHour": 0,
-                        "plugins": [new confirmDatePlugin()]
-                    }}
-            title={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter the date & time range to search and press ‘Ok’ button"}
-            value={ filterValue}
-            onClose={newValue => {
-              if(newValue) {
-                // To apply serverside filter only when the value is changed
-                let isValueChanged = false;
-                if (value !== undefined && value.length !== newValue.length) {
-                  isValueChanged = true;
-                } else if (value && value.length === newValue.length) {
-                  if (value.length === 1 && !(moment(value[0]).isSame(moment(newValue[0])))) {
-                    isValueChanged = true
-                } else if (value && value.length === 2 &&
-                    (!(moment(value[0]).isSame(moment(newValue[0]))) ||
-                    !(moment(value[1]).isSame(moment(newValue[1]))))) {
-                    isValueChanged = true;
-                  }
-                }
-                setValue(newValue);
-                setFilter(newValue);
-                if(storeFilter) {
-                  TableUtil.saveFilter(currentTableName, Header, newValue);
-                }
-                if ((newValue !== '' && newValue !== 'Invalid date' ) && isValueChanged  && doServersideFilter) {
-                  callServerFilter(newValue);
-                }
-              }
-            }}
-          >
-            <input type="text" data-input className={`p-inputtext p-component calendar-input`}  />
-            <button className="p-button p-component p-button-icon-only calendar-button" data-toggle
-                    title="Click to select the date range" >
-                    <i className="fas fa-calendar"></i>
-            </button>
-            <button className="p-button p-component p-button-icon-only calendar-reset"
-              onClick={(value) => { 
-                setFilter(undefined); setValue([]); filterValue = [];
-                if(storeFilter){
-                    TableUtil.saveFilter(currentTableName, Header, []  );
-                }
-                if (doServersideFilter) {
-                    setFilter(undefined); 
-                    setValue('');
-                    callServerFilter(value, true);
-                }
-            }} title="Clear date range" >
-                <i className="pi pi-times" style={{color:'white'}} ></i>
-            </button>
-          </Flatpickr>
-      </div>
-  )
-}
-
-// This is a custom filter UI that uses a
-// calendar to set the value
-function CalendarColumnFilter({
-  column: { setFilter, filterValue, Header },
-}) {
-  // Calculate the min and max
-  // using the preFilteredRows
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue(null);
-      setPrevTable(currentTableName);
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if(filterValue && !value){
-        const valueAsDate = new Date(filterValue)
-        setValue(valueAsDate);
-        setFilter(valueAsDate);
-      }
-    }
-    
-  }, [filterValue, value, currentTableName]);
-
-  // Function to call the server side filtering
-  const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    if (isCleared) {
-        hasFilters = false;
-        if (filtered) {
-            _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-            filterCallback(tableOptionsState, setLoaderFunction);
-        }
-    }   else {
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-};
-  return (
-    <div className="table-filter" >
-      <Calendar showIcon value={filterValue} appendTo={document.body} dateFormat="yy-mm-dd" 
-      onChange={(e) => {
-        const value = moment(e.value).format('YYYY-MM-DD')
-        setValue(value);
-        setFilter(e.value);
-        if (value !== 'Invalid date'  && doServersideFilter) {
-          setFiltered(true);
-          callServerFilter(e);
-        }
-
-          if(storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, value);
-          }
-      }} 
-      onClearButtonClick={() => {
-        if(storeFilter) {
-          TableUtil.clearColumnFilter(currentTableName, Header);
-        }
-      }}
-      ></Calendar>
-      {value && <i onClick={(e) => { setFilter(undefined); setValue(''); setFiltered(false);
-        if (storeFilter) {
-          TableUtil.clearColumnFilter(currentTableName, Header);
-        }
-        if (doServersideFilter) {
-          setFilter(undefined); 
-          setValue('');
-          callServerFilter(e, true);
-        } }} className="tb-cal-reset pi pi-times" />}
-    </div>
-  )
-}
-
-// This is a custom filter UI that uses a
-// calendar to set the value
-function DateTimeColumnFilter({
-  column: { setFilter, filterValue, Header },
-}) {
-  const [value, setValue] = useState('');
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue(null);
-      setPrevTable(currentTableName);
-    }
-    if (storeFilter) {
-      const getValue = TableUtil.getFilter(currentTableName, Header);
-      if (getValue && !value) {
-        const valueAsDate = new Date(getValue)
-        setValue(valueAsDate);
-        setFilter(valueAsDate);
-      }
-    }
-  }, [filterValue, value, currentTableName]);
-  
-  // Function to call the server side filtering
-  const callServerFilter = (event, isCleared) => {
-      hasFilters = true;
-      _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-      if (isCleared) {
-          hasFilters = false;
-          filterCallback(tableOptionsState, setLoaderFunction);
-      } else {
-          tableOptionsState.filters.push({id: Header, value: moment(event.value, moment.ISO_8601).format('YYYY-MM-DD HH:mm:ss')});
-          filterCallback(tableOptionsState, setLoaderFunction);
-      }
-  };
-  return (
-    <div className="table-filter"  >
-      <Calendar value={value} appendTo={document.body} dateFormat="yy/mm/dd"
-       onKeyUp={(e) => {
-        if (e.key === "Enter" && doServersideFilter) {
-          callServerFilter(e);
-        }
-      }}
-      onChange={(e) => {
-        const value = moment(e.value, moment.ISO_8601).format('YYYY-MM-DD HH:mm:ss');
-        setValue(value); setFilter(value);
-        if (value !== 'Invalid date'  && doServersideFilter) {
-          callServerFilter(e);
-        }
-        
-        if(storeFilter) {
-          TableUtil.saveFilter(currentTableName, Header, value);
-        }
-      }} 
-      showIcon
-      // showTime= {true}
-      //showSeconds= {true}
-      // hourFormat= "24"
-      ></Calendar>
-      {value && <i onClick={(e) => { 
-        setFilter(undefined); setValue('');
-        if (doServersideFilter) {
-          setFilter(undefined); 
-          setValue('');
-          callServerFilter(e, true);
-        }
-        if (storeFilter) {
-          TableUtil.clearColumnFilter(currentTableName, Header);
-        }
-     }} className="tb-cal-reset pi pi-times" />}
-    </div>
-  )
-}
-
-/**
- * Custom function to filter data from date field.
- * @param {Array} rows 
- * @param {String} id 
- * @param {String} filterValue 
- */
-function fromDatetimeFilterFn(rows, id, filterValue) {
-  const filteredRows = _.filter(rows, function (row) {
-    // If cell value is null or empty
-    if (!row.values[id]) {
-      return false;
-    }
-    //Remove microsecond if value passed is UTC string in format "YYYY-MM-DDTHH:mm:ss.sssss"
-    let rowValue = moment.utc(row.values[id].split('.')[0]);
-    if (!rowValue.isValid()) {
-      // For cell data in format 'YYYY-MMM-DD'
-      rowValue = moment.utc(moment(row.values[id], 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-    }
-    const start = moment.utc(moment(filterValue, 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-
-    return (start.isSameOrBefore(rowValue));
-  });
-  return filteredRows;
-}
-
-/**
- * Custom function to filter Multi selection based on filter type (Any/All) .
- * @param {Array} rows 
- * @param {String} id 
- * @param {String} filterValue 
- */
-function multiSelectFilterFn(rows, id, filterValue) {
-  if (filterValue) {
-    const filteredRows = _.filter(rows, function (row) {
-      if (filterValue.length === 0) {
-        return true;
-      }
-      // If cell value is null or empty
-      if (!row.values[id]) {
-        return false;
-      }
-      let rowValue = row.values[id];
-      let hasData = false;
-      let columnValues = rowValue.split(',');
-      let unfilteredColValues = _.difference(filterValue, columnValues);
-      if (multiSelectOption[id] === 'Any') {
-          hasData = unfilteredColValues.length < filterValue.length;
-      }
-      else {
-          hasData = unfilteredColValues.length === 0;
-      }
-      return hasData;
-    });
-    return filteredRows;
-  }
-}
-
-/**
- * Custom filter function for boolean columns to show all if filter value is null else the actual value from tristate checkbox.
- * @param {Array} rows - table row data
- * @param {String} id  - column id
- * @param {String} filterValue - filter field value
- */
-function switchtFilterFn(rows, id, filterValue) {  
-  if (filterValue.length === 0) {
-      return rows;
-  }
-  return rows.filter((row) => row.values[id] === filterValue);
-}
-
-/**
- * Custom function to filter data from date field.
- * @param {Array} rows 
- * @param {String} id 
- * @param {String} filterValue 
- */
-function toDatetimeFilterFn(rows, id, filterValue) {
-  let end = moment.utc(moment(filterValue, 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-  end = moment(end, "DD-MM-YYYY").add(1, 'days');
-  const filteredRows = _.filter(rows, function (row) {
-    // If cell value is null or empty
-    if (!row.values[id]) {
-      return false;
-    }
-    //Remove microsecond if value passed is UTC string in format "YYYY-MM-DDTHH:mm:ss.sssss"
-    let rowValue = moment.utc(row.values[id].split('.')[0]);
-    if (!rowValue.isValid()) {
-      // For cell data in format 'YYYY-MMM-DD'
-      rowValue = moment.utc(moment(row.values[id], 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-    }
-    return (end.isSameOrAfter(rowValue));
-  });
-  return filteredRows;
-}
-
-/**
- * Custom function to filter data from date field.
- * @param {Array} rows 
- * @param {String} id 
- * @param {String} filterValue 
- */
-function dateFilterFn(rows, id, filterValue) {
-  const filteredRows = _.filter(rows, function (row) {
-    // If cell value is null or empty
-    if (!row.values[id]) {
-      return false;
-    }
-    //Remove microsecond if value passed is UTC string in format "YYYY-MM-DDTHH:mm:ss.sssss"
-    let rowValue = moment.utc(row.values[id].split('.')[0]);
-    if (!rowValue.isValid()) {
-      // For cell data in format 'YYYY-MMM-DD'
-      rowValue = moment.utc(moment(row.values[id], 'YYYY-MM-DD').format("YYYY-MM-DDT00:00:00"));
-    }
-    const start = moment.utc(moment(filterValue, 'YYYY-MM-DD').format("YYYY-MM-DDT00:00:00"));
-    const end = moment.utc(moment(filterValue, 'YYYY-MM-DD').format("YYYY-MM-DDT23:59:59"));
-    return (start.isSameOrBefore(rowValue) && end.isSameOrAfter(rowValue));
-  });
-  return filteredRows;
-}
-
-/**
- * Custom function to filter data Range from date field.
- * @param {Array} rows 
- * @param {String} id 
- * @param {String} filterValue 
- */
- function dateRangeFilterFn(rows, id, filterValue) {
-  const filteredRows = _.filter(rows, function (row) {
-    // If cell value is null or empty
-    if (filterValue.length>0 && !row.values[id]) {
-      return false;
-    } else if (!row.values[id]) {
-      return true;
-    }
-    //Remove microsecond if value passed is UTC string in format "YYYY-MM-DDTHH:mm:ss.sssss"
-    let rowValue = moment.utc(row.values[id].split('.')[0]);
-    if (!rowValue.isValid()) {
-      // For cell data in format 'YYYY-MMM-DD'
-      rowValue = moment.utc(moment(row.values[id], 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-    }
-    const start = moment.utc(moment(filterValue[0], 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-    const end = moment.utc(moment(filterValue[1], 'YYYY-MM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-    if(moment(end,'YYYY-MM-DDTHH:mm:SS', true).isValid() && moment(start,'YYYY-MM-DDTHH:mm:SS', true).isValid()) {
-        return (start.isSameOrBefore(rowValue) && end.isSameOrAfter(rowValue));
-    }
-    else if(moment(start,'YYYY-MM-DDTHH:mm:SS', true).isValid()) {
-      return (start.isSameOrBefore(rowValue));
-    }
-    else {
-      return true;
-    }
-  });
-  return filteredRows;
-}
-
-function durationTimeFilterFn(rows, id, filterValue) {
-  const filteredRows = _.filter(rows, function (row) {
-    // If cell value is null or empty
-    if (!row.values[id]) {
-      return false;
-    }
-    //Remove microsecond if value passed is UTC string in format "HH:mm:ss.sssss"
-    let rowValue = moment(row.values[id], 'HH:mm:SS');
-    if (!rowValue.isValid()) {
-      // For cell data in format 'HH:mm:SS'
-      rowValue = moment(row.values[id], 'HH:mm:SS');
-    }
-    const start = moment(filterValue[0], 'HH:mm:SS');
-    const end = moment(filterValue[1], 'HH:mm:SS');
-    if(moment(end,'HH:mm:SS', true).isValid() && moment(start,'HH:mm:SS', true).isValid()) {
-      return (start.isSameOrBefore(rowValue) && end.isSameOrAfter(rowValue));
-    }
-    else if (!(moment(end,'HH:mm:SS', true).isValid()) && !(moment(start,'HH:mm:SS', true).isValid()) ){
-      return true
-    }
-    else if(!(moment(start,'HH:mm:SS', true).isValid())) {
-      return end.isSameOrAfter(rowValue);
-    }
-    else if(!(moment(end,'HH:mm:SS', true).isValid())) {
-      return start.isSameOrBefore(rowValue);
-    }
-  });
-  return filteredRows;
-}
-
-// This is a custom UI for our 'between' or number range
-// filter. It uses slider to filter between min and max values.
-function RangeColumnFilter({
-  column: { filterValue = [], preFilteredRows, setFilter, id, Header },
-}) {
-  let [firstLoad, setFirstLoad] = useState(true);
-  const [min, max] = React.useMemo(() => {
-    let min = 0;
-    let max = 0;
-    if (preFilteredRows.length > 0 && preFilteredRows[0].values[id]) {
-      min = preFilteredRows[0].values[id];
-    }
-    preFilteredRows.forEach(row => {
-      min = Math.min(row.values[id] ? row.values[id] : 0, min);
-      max = Math.max(row.values[id] ? row.values[id] : 0, max);
-    });
-    if (storeFilter && firstLoad) {
-      setTimeout(updateFilter,10);
-    }
-    return [min, max];
-  }, [id, preFilteredRows]);
-  if (filterValue.length === 0) {
-    filterValue = [min, max];
-  }
-  return (
-    <>
-      <div className="filter-slider-label">
-        <span style={{ float: "left" }}>{filterValue[0]}</span>
-        <span style={{ float: "right", marginRight: "5px" }}>{min !== max ? filterValue[1] : ""}</span>
-      </div>
-      <Slider value={filterValue} min={min} max={max} className="filter-slider"
-        style={{}}
-        onChange={(e) => { 
-          setFilter(e.value); 
-            if(storeFilter) {
-              TableUtil.saveFilter(currentTableName, Header, e.value);
-            }
-          }} range />
-    </>
-  );
-
-  function updateFilter() {
-    let storedFilter = TableUtil.getFilter(currentTableName, Header);
-    if (storedFilter) {
-      setFilter(storedFilter);
-      setFirstLoad(false);
-    }
-  }
-}
-
-/**
- * Number range rilter
- * @param {number} param0 : Range value for min and max filters
- * @returns 
- */
-function NumberRangeFilter({
-  column: { filterValue = [],  setFilter, Header },
-}) {
-  let [rangeValue, setRangeValue] = useState([0,0]);
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  React.useEffect(() => {
-    if (!filterValue && value) {
-      setValue('');     
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if (filterValue) {
-          setFiltered(true);
-      }
-      if(!value){
-          setValue(filterValue);
-      }
-    }
-  }, [filterValue, value]);
-  
-   // Function to call the server side filtering
-   const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-    if (isCleared) {
-        hasFilters = false;
-        if (filtered) {
-            filterCallback(tableOptionsState, setLoaderFunction);
-        }
-    }   else {
-        tableOptionsState.filters.push({id: Header, value: rangeValue});
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-  };
-
-  return (
-    <div
-      style={{
-        alignItems: 'center'
-      }}
-    >
-      <InputText
-        value={value[0]}
-        type="number"
-        onKeyUp={(e) => {
-          if (e.key === "Enter" && doServersideFilter) {
-            TableUtil.saveFilter(currentTableName, Header, rangeValue);
-            setFiltered(true);
-            callServerFilter(e, false);
-          }
-        }}
-        onChange={e => {
-          setFilter(undefined);  setFiltered(false);
-          const val = e.target.value;
-          let max = rangeValue[1];
-          setValue([val,max]);
-          setFilter(val && max ? [val, max] : undefined);
-          setRangeValue([val,max]);
-          filterValue[0] = val;
-          if(storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, [val,max]);
-            setFilter([val,max]);
-          }
-        }}
-        style={{
-          width: '65px',
-          height: '25px'
-        }}
-        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Minimum Range value and press ‘Enter’ key to search"}
-      />
-      
-      <InputText
-        value={value[1]}
-        type="number"
-        onKeyUp={(e) => {
-          if (e.key === "Enter" && doServersideFilter) {
-            setFiltered(true);
-            callServerFilter(e, false);
-          }
-        }}
-        onChange={e => {
-          const val = e.target.value;
-          let min = rangeValue[0];
-          setRangeValue([min,val]);
-          filterValue[1] = val;
-          setValue([min,val]);
-          setFilter(min && val ? [min, val] : undefined);
-          if(storeFilter) {
-            TableUtil.saveFilter(currentTableName, Header, [min,val]);
-            setFilter([min,val]);
-          }
-        }}         
-        style={{
-          width: '65px',
-          height: '25px'
-        }}
-        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Maximum Range value and press ‘Enter’ key to search"}
-      />
-    </div>
-  )
-}
-
-// Rank Range Filter
-function RankRangeFilter({
-  column: { filterValue = [],  setFilter, Header },
-}) {
-  let [rangeValue, setRangeValue] = useState(['','']);
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName && value!=='') {
-      setValue('');
-      setPrevTable(currentTableName);
-      //setRangeValue([])
-    }
-    if (storeFilter) {
-      setTimeout(CheckFilters,10);
-      
-    }
-  }, [filterValue, value]);
-  
-   // Function to call the server side filtering
-   const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-    if (isCleared) {
-        hasFilters = false;
-        if (filtered) {
-            filterCallback(tableOptionsState, setLoaderFunction);
-        }
-    }   else {
-        tableOptionsState.filters.push({id: Header, value: rangeValue});
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-  };
-
-  return (
-    <div
-      style={{
-        alignItems: 'center'
-      }}
-    >
-      <input type="decimal"
-          title={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Minimum Range value and press ‘Enter’ key to search"}
-          max="1"
-          min="0"
-          className="p-inputtext p-component"
-          value={value[0]}
-          step="0.0001"
-          onKeyUp={(e) => {
-              if (e.key === "Enter" && doServersideFilter) {
-                  TableUtil.saveFilter(currentTableName, Header, rangeValue);
-                  setFiltered(true);
-                  callServerFilter(e, false);
-              }
-          }}
-          onChange={e => {
-              let val = e.target.value;
-              val = val.replace(/([^0-9.]+)/, "");
-              const match = /(\d{0,1})[^.]*((?:\.\d{0,4})?)/g.exec(val);
-              val = match[1] + match[2];
-              if (val === '' || (val >= 0 && val <= 1)) {
-                  let max = rangeValue[1];
-                  setValue([val,max]);
-                  setFilter(val && max ? [val, max] : undefined);
-                  setRangeValue([val,max]);
-                  filterValue[0] = val;
-                  if(storeFilter) {
-                      TableUtil.saveFilter(currentTableName, Header, [val,max]);
-                  }
-            }   
-          }}
-          style={{
-            minWidth: '48px',
-            maxWidth: '85px',
-            width:'100%',
-            height: '25px'
-          }}
-      />
-       
-      <input type="decimal"
-          title={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Maximum Range value and press ‘Enter’ key to search"}
-          max="1"
-          min="0"
-          className="p-inputtext p-component"
-          value={value[1]}
-          step="0.0001"
-          onKeyUp={(e) => {
-              if (e.key === "Enter" && doServersideFilter) {
-                  TableUtil.saveFilter(currentTableName, Header, rangeValue);
-                  setFiltered(true);
-                  callServerFilter(e, false);
-              }
-          }}
-          onChange={e => {
-              setFilter(undefined);  setFiltered(false);
-              let val = e.target.value;
-              val = val.replace(/([^0-9.]+)/, "");
-              const match = /(\d{0,1})[^.]*((?:\.\d{0,4})?)/g.exec(val);
-              val = match[1] + match[2];
-              if (val === '' || (val >= 0 && val <= 1)) {
-                  let min = rangeValue[0];
-                  setRangeValue([min,val]);
-                  filterValue[1] = val;
-                  setValue([min,val]);
-                  setFilter(min && val ? [min, val] : undefined);
-                  if(storeFilter) {
-                    TableUtil.saveFilter(currentTableName, Header, [min,val]);
-                  }  
-              }   
-          }}
-          style={{
-            minWidth: '48px',
-            maxWidth: '85px',
-            width:'100%',
-            height: '25px'
-          }}
-      />
-    </div>
-  )
-
-  function CheckFilters() {
-    const filterValue = TableUtil.getFilter(currentTableName, Header);
-    if (filterValue) {
-      setFiltered(true);
-    }
-    if (!value) {
-      setValue(filterValue);
-    }
-    if (!filterValue && value.length > 0 && (value[0] !== '' || value[1] !== '')) {
-      setValue(['', '']);
-      setRangeValue(['', '']);
-    }
-  }
-}
-
-// Duration Range Filter
-function DurationRangeFilter({
-  column: { filterValue = [],  setFilter,  Header },
-}) {
-
-  let [rangeValue, setRangeValue] = useState(['','']);
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [prevTable, setPrevTable] = useState('');
-  React.useEffect(() => {
-    if ((!filterValue && value) || prevTable !== currentTableName) {
-      setValue('');     
-      setPrevTable(currentTableName);
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      if (filterValue) {
-          setFiltered(true);
-      }
-      if(filterValue && !value){
-          setValue(filterValue);
-          setFilter(filterValue);
-      }
-      if(value[0] !== filterValue[0] ) {
-        setValue(filterValue)
-      }
-      if(!filterValue && value.length>0){
-        setValue([]);
-      }
-    }
-  }, [filterValue, value, currentTableName]);
-  
-   // Function to call the server side filtering
-   const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-    if (isCleared) {
-        hasFilters = false;
-        if (filtered) {
-            filterCallback(tableOptionsState, setLoaderFunction);
-        }
-    }   else {
-        tableOptionsState.filters.push({id: Header, value: rangeValue});
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-  };
-
-  return (
-    <div
-      onKeyDown={(e) => {
-        if (e.key === "Enter" && doServersideFilter) {
-          TableUtil.saveFilter(currentTableName, Header, rangeValue);
-          setFiltered(true);
-          callServerFilter(e, false);
-        }
-        else if(e.key === "Enter" ) {
-          setFilter(rangeValue);
-        }
-      }}
-      style={{
-        alignItems: 'center'
-      }}
-    >
-
-      <InputMask mask="99:99:99"
-          value={value[0]}
-          placeholder="HH:mm:ss"
-          tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Minimum Range value in HH:mm:ss format and press ‘Enter’ key to search"}
-          onChange={e => {
-            let val = e.target.value;
-            if (val.includes(":") && !Validator.isValidHHmmss(val)) {
-              val = rangeValue[0];
-            }
-            let max = rangeValue[1];
-            setValue([val,max]);
-            if(doServersideFilter) {
-              setFilter(val && max ? [val, max] : undefined);
-            }
-            setRangeValue([val,max]);
-            filterValue[0] = val;
-            if(storeFilter) {
-                TableUtil.saveFilter(currentTableName, Header, [val,max]);
-            }
-          }}
-          style={{
-            minWidth: '48px',
-            maxWidth: '85px',
-            width:'100%',
-            height: '25px'
-          }}
-      />
-      
-    
-    <InputMask mask="99:99:99"
-          value={value[1]}
-          tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Maximum Range value in HH:mm:ss format and press ‘Enter’ key to search"}
-          placeholder="HH:mm:ss"
-          onChange={e => {
-            let val = e.target.value;
-            if (val.includes(":") && !Validator.isValidHHmmss(val)) {
-              val = rangeValue[1];
-            }
-            let min = rangeValue[0];
-            setValue([min,val]);
-            if(doServersideFilter) {
-              setFilter(min && val ? [min, val] : undefined);
-           }
-            setRangeValue([min,val]);
-            filterValue[1] = val;
-            if(storeFilter) {
-                TableUtil.saveFilter(currentTableName, Header, [min,val]);
-            }
-          }}
-          style={{
-            minWidth: '48px',
-            maxWidth: '85px',
-            width: '100%',
-            height: '25px'
-          }}
-    />
-    </div>
-     
-  )
-}
-
-// Duration Range Filter
-function DurationRangeFilterWithDays({
-  column: { filterValue = [],  setFilter,  Header },
-}) {
-  let [rangeValue, setRangeValue] = useState([0,0]);
-  const [value, setValue] = useState('');
-  const [filtered, setFiltered] = useState(false);
-  const [filterType, setFilterType]  = useState();
-
-  React.useEffect(() => {
-    if (!filterValue && value) {
-      setValue('');     
-    }
-    if (storeFilter) {
-      const filterValue = TableUtil.getFilter(currentTableName, Header);
-      const storedFilterType = TableUtil.getFilter(currentTableName, `${Header}-FilterOption`);
-      if (filterValue) {
-          setFiltered(true);
-          setFilterType('Range');
-      } else {
-        setFilterType('All');
-      }
-
-      if (storedFilterType) {
-        setFilterType(storedFilterType);
-      }
-      if(!value){
-          setValue(filterValue);
-      }
-    }
-  }, [filterValue, value]);
-  
-   // Function to call the server side filtering
-   const callServerFilter = (event, isCleared) => {
-    hasFilters = true;
-    _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-    if (isCleared) {
-      hasFilters = false;
-      if (filtered) {
-          filterCallback(tableOptionsState, setLoaderFunction);
-      }
-    }   else {
-        tableOptionsState.filters.push({id: Header, value: rangeValue});
-        filterCallback(tableOptionsState, setLoaderFunction);
-    }
-  };
-  const filterTypeChangeEvent =(e) => {
-      setFilterType(e.value);
-      if(e.value === null || e.value === 'All') {
-        setFiltered(false);
-        _.remove(tableOptionsState.filters, function(filter) { return filter.id === 'durationNull' });
-        _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-        callServerFilter(e, true);
-      } else if( e.value === 'Range') {
-        setFiltered(true);
-        setRangeValue([0,0]);
-        setValue([0,0]);
-        _.remove(tableOptionsState.filters, function(filter) { return filter.id === 'durationNull' });
-      } else if( e.value === 'Unknown') {
-        setFiltered(true);
-        _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
-        tableOptionsState.filters.push({id: 'durationNull', value: true});
-        filterCallback(tableOptionsState, setLoaderFunction);
-      }
-
-      if (storeFilter) {
-        if (e.value) {
-          TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, e.value);
-          tableOptionsState.filters.push({id: `${Header}-FilterOption`, value: e.value});
-          setFiltered(true);
-        } else {
-          TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, null);
-        }
-      }
-  }
-
-  return (
-    <div
-      onKeyDown={(e) => {
-        if (e.key === "Enter" && doServersideFilter) {
-          TableUtil.saveFilter(currentTableName, Header, rangeValue);
-          setFiltered(true);
-          callServerFilter(e, false);
-        }
-      }}
-      style={{
-        alignItems: 'center'
-      }}
-    >
-      <div >
-          <div >
-              <Dropdown optionLabel="name" optionValue="name"
-                        tooltip="Select the Duration filter type to search"
-                        value={filterType}
-                        options={[{name:'All', value: 'All'},{name:'Range', value: 'Range'},{name:'Unknown', value: 'Unknown'}]}
-                        onChange={(e) => {filterTypeChangeEvent(e)}}
-                        style={{width: '10em'}}
-                        showClear={true}
-                        />
-              { filterType === 'Range' &&
-                  <div style={{marginTop: '1em'}}>
-                    <InputMask mask="999 99:99:99"
-                        value={value[0]}
-                        placeholder="DDD HH:mm:ss"
-                        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Minimum Range value in DDD HH:mm:ss format and press ‘Enter’ key to search"}
-                        onChange={e => {
-                          setFilter(undefined);  setFiltered(false);
-                          let val = e.target.value;
-                          if (val.includes(":") && !Validator.isValidDDDHHmmss(val, false)) {
-                            val = rangeValue[0];
-                          }
-                          let max = rangeValue[1];
-                          setValue([val,max]);
-                          setFilter(val && max ? [val, max] : undefined);
-                          setRangeValue([val,max]);
-                          filterValue[0] = val;
-                          if(storeFilter) {
-                              setFilter([val,max]);
-                          }
-                        }}
-                        style={{
-                          width: '115px',
-                          height: '25px'
-                        }}
-                    />
-                  
-                    <InputMask mask="999 99:99:99"
-                          value={value[1]}
-                          tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Maximum Range value in DDD HH:mm:ss format and press ‘Enter’ key to search"}
-                          placeholder="DDD HH:mm:ss"
-                          onChange={e => {
-                            setFilter(undefined);  setFiltered(false);
-                            let val = e.target.value;
-                            if (val.includes(":") && !Validator.isValidDDDHHmmss(val, false)) {
-                              val = rangeValue[1];
-                            }
-                            let min = rangeValue[0];
-                            setValue([min,val]);
-                            setFilter(min && val ? [min, val] : undefined);
-                            setRangeValue([min,val]);
-                            filterValue[1] = val;
-                            if(storeFilter) {
-                                setFilter([min,val]);
-                            }
-                          }}
-                          style={{
-                            width: '115px',
-                            height: '25px'
-                          }}
-                    />
-                  </div>
-              }
-          </div>
-        </div>
-    </div>
-     
-  )
-}
-
-// This is a custom UI for our 'between' or number range
-// filter. It uses two number boxes and filters rows to
-// ones that have values between the two
-function NumberRangeColumnFilter({
-  column: { filterValue = [], preFilteredRows, setFilter, id, Header },
-}) {
-  const [errorProps, setErrorProps] = useState({});
-  const [maxErr, setMaxErr] = useState(false);
-  const [min, max] = React.useMemo(() => {
-    let min = preFilteredRows.length ? preFilteredRows[0].values[id] : 0
-    let max = preFilteredRows.length ? preFilteredRows[0].values[id] : 0
-    preFilteredRows.forEach(row => {
-      min = Math.min(row.values[id], min)
-      max = Math.max(row.values[id], max)
-    })
-    return [min, max]
-  }, [id, preFilteredRows])
-
-  return (
-    <div
-      style={{
-        //  display: 'flex',
-        //  flexdirection:'column',
-        alignItems: 'center'
-      }}
-    >
-      <InputText
-        value={filterValue[0]}
-        type="number"
-        onChange={e => {
-          const val = e.target.value;
-          setFilter((old = []) => [val ? parseFloat(val, 10) : undefined, old[1]]);
-        }}
-        placeholder={`Min (${min})`}
-        style={{
-          width: '55px',
-          height: '25px'
-          // marginRight: '0.5rem',
-        }}
-        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Minimum Range value and press ‘Enter’ key to search"}
-      />
-      <InputText
-        value={filterValue[1] || ''}
-        type="number"
-        {...errorProps}
-        className={maxErr && 'field-error'}
-        onChange={e => {
-          const val = e.target.value;
-          const minVal = filterValue.length && filterValue[0];
-          if (minVal && e.target.value < minVal) {
-            setMaxErr(true);
-            setErrorProps({
-              tooltip: "Max value should be greater than Min",
-              tooltipOptions: { event: 'hover' }
-            });
-          } else {
-            setMaxErr(false);
-            setErrorProps({});
-          }
-          setFilter((old = []) => [old[0], val ? parseFloat(val, 10) : undefined])
-        }}
-        placeholder={`Max (${max})`}
-        style={{
-          width: '55px',
-          height: '25px'
-          //  marginLeft: '0.5rem',
-        }}
-        tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Maximum Range value and press ‘Enter’ key to search"}
-      />
-    </div>
-  )
-}
-
-
-function fuzzyTextFilterFn(rows, id, filterValue) {
-  return matchSorter(rows, filterValue, { keys: [row => row.values[id]] });
-}
-
-const filterTypes = {
-  'select': {
-    fn: SelectColumnFilter,
-  },
-  // This component has Any and All Radio buttons
-  'multiselect': {
-    fn: MultiSelectColumnFilter,
-    type: multiSelectFilterFn
-  },
-  // This component does not have Any and All Radio buttons
-  'multiselect-filter': {
-    fn: MultiSelectFilter,
-    type: multiSelectFilterFn
-  },
-  'switch': {
-    fn: BooleanColumnFilter,
-    type: switchtFilterFn
-  },
-  'slider': {
-    fn: SliderColumnFilter
-  },  
-  
-  'date': {
-    fn: CalendarColumnFilter,
-    type: dateFilterFn
-  },
-  'dateRange': {
-    fn: DateRangeColumnFilter,
-    type: dateRangeFilterFn
-  },
-  'flatpickrDateRange': {
-    fn: FlatpickrRangeColumnFilter,
-    type: dateRangeFilterFn
-  },
-  
-  'fromdatetime': {
-    fn: DateTimeColumnFilter,
-    type: fromDatetimeFilterFn
-  },
-  'todatetime': {
-    fn: DateTimeColumnFilter,
-    type: toDatetimeFilterFn
-  },
-  'range': {
-    fn: RangeColumnFilter,
-    type: 'between'
-  },
-  'minMax': {
-    fn: NumberRangeColumnFilter,
-    type: 'between'
-  },
-  'numberRangeMinMax': {
-    fn: NumberRangeFilter,
-    type: 'between'
-  },
-  'rankMinMax': {
-    fn: RankRangeFilter,
-    type: 'between'
-  },
-  'durationMinMax': {
-    fn: DurationRangeFilter,
-    type: durationTimeFilterFn
-  },
-  'durationWithDaysMinMax': {
-    fn: DurationRangeFilterWithDays,
-    type: 'between'
-  }
-};
-
-// Let the table remove the filter if the string is empty
-fuzzyTextFilterFn.autoRemove = val => !val
-
-const IndeterminateCheckbox = React.forwardRef(
-  ({ indeterminate, ...rest }, ref) => {
-    const defaultRef = React.useRef()
-    const resolvedRef = ref || defaultRef
-    React.useEffect(() => {
-      if (resolvedRef?.current!==undefined)   resolvedRef.current.indeterminate = indeterminate
-    }, [resolvedRef, indeterminate])
-    return <input type="checkbox" ref={resolvedRef} {...rest}/>
-  }
-);
-
-IndeterminateCheckbox.propTypes = {
-  indeterminate: PropTypes.any
-}
-IndeterminateCheckbox.displayName="IndeterminateCheckbox"
- 
-
-
-const IndeterminateRadioButton = React.forwardRef(
-  ({ indeterminate, ...rest }, ref) => {
-    const defaultRef = React.useRef()
-    const resolvedRef = ref || defaultRef
-    React.useEffect(() => {
-      if (resolvedRef?.current!==undefined)   resolvedRef.current.indeterminate = indeterminate
-    }, [resolvedRef, indeterminate])
-     return <input type="radio"  ref={resolvedRef} {...rest} />
-  }
-);
-
-IndeterminateRadioButton.propTypes = {
-  indeterminate: PropTypes.any
-}
-IndeterminateRadioButton.displayName="IndeterminateRadioButton"
-// ViewTable table component
-function Table(props) {
-  let {fetchData,  pageCount: controlledPageCount, currentPage, dataFetchStatus, columns, data, defaultheader, optionalheader, 
-    tablename, defaultSortColumn, defaultpagesize, columnOrders, showAction, toggleBySorting, lsKeySortColumn
-    , descendingColumn, ignoreSorting } = props;
-  ignoreSorting = ignoreSorting ||[];
-  ignoreSorting = [...ignoreSorting,'action'];
-  descendingColumn = descendingColumn || [];
-  const checkDefaultSortColumnEmpty = () => {
-    return !defaultSortColumn?.[0] || Object.keys(defaultSortColumn[0]).length === 0;
-  }
-  const checkDescendingColumnExists = (value) => {
-    return descendingColumn.includes(value);
-  }
-  const checkToIgnoreSorting = (value) => {
-    return ignoreSorting.includes(value);
-  }
-  const getFirstVisibleColumn = (selectedColumn, tempAllColumns) => {
-    let selected = {};
-    let tempColumn = {};
-    let totalColumns ;
-
-    if (tempAllColumns && tempAllColumns.length > 0) {
-      totalColumns = tempAllColumns;
-    }
-
-    if (totalColumns) {
-      for (let i = 0; i < totalColumns.length; i++) {
-        tempColumn = { ...totalColumns[i] };
-        if (tempColumn.Header && typeof tempColumn.Header === "string") {
-          if (tempColumn.Header.toLowerCase() === selectedColumn.Header.toLowerCase()) {
-            tempColumn.isVisible = selectedColumn.isVisible;
-          }
-          if (!checkToIgnoreSorting(tempColumn.Header.toLowerCase()) && tempColumn.isVisible) {
-            selected = tempColumn;
-            break;
-          }
-        }
-      }
-    }
-    return selected;
-  }
-
-  if (checkDefaultSortColumnEmpty()) {
-    let tempVisibleColumn = getFirstVisibleColumn({ Header: '' }, columns);
-    defaultSortColumn = [{ id: tempVisibleColumn.Header, desc: checkDescendingColumnExists(tempVisibleColumn.Header.toLowerCase()) }];
-  }
-
-  const filterTypes = React.useMemo(
-    () => ({
-        // Add a new fuzzyTextFilterFn filter type.
-        fuzzyText: fuzzyTextFilterFn,
-        // Or, override the default text filter to use
-        // "startWith"
-        text: (rows, id, filterValue) => {
-            return rows.filter(row => {
-                const rowValue = row.values[id]
-                if (rowValue === false) {
-                    return false;
-                } else {
-                    return rowValue !== undefined ?
-                        String(rowValue)
-                        .toLowerCase()
-                        .startsWith(String(filterValue).toLowerCase()) :
-                        true
-                }
-            })
-        },
-    }),
-    []
-  )
-
-  const defaultColumn = React.useMemo(
-    () => ({
-      // Let's set up our default Filter UI
-      Filter: DefaultColumnFilter,
-      minWidth: 60,
-      maxWidth: 600
-    }),
-    []
-  )
-
-  let tableParams = {
-    columns,
-    data,
-    defaultColumn,
-    filterTypes,
-    initialState: {
-      pageIndex: doServersideFilter?currentPage:0,
-      pageSize: (defaultpagesize && defaultpagesize > 0) ? defaultpagesize : 10,
-      sortBy: defaultSortColumn
-    },
-    manualPagination: doServersideFilter,
-    manualSortBy: doServersideFilter,
-    manualFilters: doServersideFilter,
-
-    getExportFileBlob,
-  };
-  if (doServersideFilter) {
-    tableParams.pageCount = controlledPageCount;
-  }
-
-  if (isOnlySingleRowAllowed){
-    tableParams.stateReducer= (newState, action) => {
-      if (action.type === "toggleRowSelected") {
-        newState.selectedRowIds = {
-          [action.id]: true
-        }
-      }
-      return newState;
-  }
-
-  }
-  const {
-    getTableProps,
-    getTableBodyProps,
-    headerGroups,
-    rows,
-    prepareRow,
-    setAllFilters,
-    allColumns,
-    getToggleHideAllColumnsProps,
-    state,
-    page,
-    setGlobalFilter,
-    setHiddenColumns,
-    
-    selectedFlatRows,
-    setColumnOrder,
-    exportData,
-     gotoPage,
-    setPageSize,
-    state: {sortBy, pageIndex, pageSize },
-  } = tblinstance = useTable(
-    {...tableParams,
-    
-    
-
-    },
-    
-    useFilters,
-    useGlobalFilter,
-    useSortBy,
-    usePagination,
-    useRowSelect,
-    useColumnOrder,
-    useExportData,
-    useFlexLayout,
-    useResizeColumns
-  
-  );
-  const currentColOrder = React.useRef();
-  const [currentpage, setcurrentPage] = React.useState(0);
-  const [currentrows, setcurrentRows] = React.useState(defaultpagesize);
-  const [custompagevalue, setcustompagevalue] = React.useState();
-  
-  let pageCount = doServersideFilter?controlledPageCount:data.length;
-  tmpTableData = data;  
-  // while siwtch the task type or Su type, this will set the relavent default sort column
-  if (currentTableName && currentTableName !== tablename) {
-      state.sortBy = defaultSortColumn;
-      setcurrentPage(0);
-  }
-  currentTableName = props.tablename;
-
-    tableOptionsState = _.cloneDeep(state);
-
-  // Pass the table's state to the parent function if the parent function has set the callback function for it.
-  if (props.setTableState) {
-    props.setTableState(state);
-  }
-  const [loading, setLoading] = React.useState(false);
-  setLoaderFunction = setLoading;
-  React.useEffect(() => {
-    fetchData({ state, setLoading });
-    }, [sortBy, fetchData, pageIndex, pageSize,  filterTypes,]);
-
-  React.useEffect(() => {
-    const storedColOrder = UtilService.localStore({ type: 'get', key: tablename+'colOrder'});
-    //sometime column order not set properly, so everytime compare the stored order and props.columnOrder before setting
-    if (!_.isEmpty(storedColOrder)) {
-      setColumnOrder(storedColOrder)
-    }
-    else if (columnOrders?.length) {
-      if (showAction === 'true' || showAction===true) {
-        setColumnOrder(['Select', 'Action', ...columnOrders]);
-        UtilService.localStore({ type: 'set', key: tablename+'colOrder', value: ['Select', 'Action', ...columnOrders]});
-      } else {
-        setColumnOrder(['Select', ...columnOrders]);
-        UtilService.localStore({ type: 'set', key: tablename+'colOrder', value: ['Select', ...columnOrders]});
-      }
-    }
-    setLoading(dataFetchStatus);
-  }, [setHiddenColumns, columns]);
-
-  React.useEffect(() => {
-    const setHiddenColumnsTimeout = setTimeout(() => {
-      setHiddenColumns(columns.filter(column => !column.isVisible).map(column => column.id));
-    }, 10); // Set the timeout duration in milliseconds (adjust as needed)
-    return () => clearTimeout(setHiddenColumnsTimeout);
-  },[setHiddenColumns, columns]);
-
-  let overlayPanel = useRef(null);
-
-  const onPagination = (e) => {
-    loadingStatus = true;
-    setLoading(true);
-    gotoPage(e.page);
-    setcurrentPage(e.first);
-    setcurrentRows(e.rows);
-    setPageSize(e.rows)
-    if ([10, 25, 50, 100].includes(e.rows)) {
-      setcustompagevalue();
-    }
-  };
-  const onCustomPage = () => {
-    loadingStatus = true;
-    setLoading(true);
-    if (typeof custompagevalue === 'undefined' || custompagevalue == null) return;
-    gotoPage(0);
-    setcurrentPage(0);
-    setcurrentRows(custompagevalue);
-    setPageSize(custompagevalue);
-  };
-
-  const onChangeCustompagevalue = (e) => {
-    setcustompagevalue(e.value);
-  }
-
-  const onShowAllPage = () => {
-    loadingStatus = true;
-    setLoading(true);
-    gotoPage(0);
-    setcurrentPage(0);
-    setcurrentRows(0);
-    setPageSize(pageCount)
-    setcustompagevalue();
-  };
-
-  const onColumnToggleViewTable = (selectedColumn, sortedColumn) => {
-    let visibleColumn = {};
-    let viewColumn = {};
-    if (selectedColumn && selectedColumn.Header === sortedColumn.Header && !selectedColumn.isVisible) {
-      visibleColumn = getFirstVisibleColumn(selectedColumn, allColumns);     
-      viewColumn = { Header: visibleColumn.Header, desc: checkDescendingColumnExists(visibleColumn.Header.toLowerCase())};
-      let tempdefaultSortColumn = [{ id: viewColumn.Header, desc: viewColumn.desc }];
-      if (lsKeySortColumn && lsKeySortColumn.trim().length > 0) {
-        localStorage.setItem(lsKeySortColumn, JSON.stringify(tempdefaultSortColumn));
-      }
-    }
-    visibleColumn.Header = visibleColumn.Header || "";
-    return viewColumn;
-  }
-
-  const onToggleChange = (e) => {
-    let lsToggleColumns = [];
-    let selectedColumn = null;
-    let sortedColumn = {};
-    let defaultVisible = false;
-    if (e.target.id === '') {
-      defaultVisible = e.target.checked;
-    } 
-    // allColumns.forEach(acolumn => {
-    for (const acolumn of allColumns) {
-      let jsonobj = {};
-      let visible = (acolumn.Header === e.target.id) ? (!(acolumn.isVisible)) : e.target.id === '' ? defaultVisible : acolumn.isVisible;
-      jsonobj['Header'] = acolumn.Header;
-      jsonobj['isVisible'] = visible;
-      lsToggleColumns.push(jsonobj)
-      selectedColumn = (acolumn.Header === e.target.id) ? jsonobj : selectedColumn;
-      if (acolumn.isSorted) {
-        sortedColumn['Header'] = acolumn.Header;
-        sortedColumn['isVisible'] = visible;
-      }
-      // Remove the column filters stored and clear the column filter, if the column is toogled to 
-      if (!visible) {
-          if (storeFilter) {
-              TableUtil.clearColumnFilter(currentTableName, acolumn.Header);
-          }
-          _.remove(tableOptionsState.filters, ['id', acolumn.Header]);
-          setAllFilters(tableOptionsState.filters);
-      }
-    }
-  // });
-    localStorage.setItem(tablename, JSON.stringify(lsToggleColumns));
-
-    if (onColumnToggleViewTable) {
-      let columnTobeSorted = onColumnToggleViewTable(selectedColumn, sortedColumn); 
-      columnTobeSorted.Header = columnTobeSorted.Header || "";
-      if (columnTobeSorted.Header.trim().length > 0) {
-        tblinstance.toggleSortBy(columnTobeSorted.Header, columnTobeSorted.desc);
-      }
-    }   
-  }
-  
-  filteredData = _.map(rows, 'values');
-  if (parentCallbackFunction) {
-    parentCallbackFunction(filteredData);
-  }
-
-  /** Assign current table instance to variable in parent class - just used for refresh the filter state*/
-  if (tableInstanceRef) {
-    tableInstanceRef(tblinstance);
-  }
-
-  /* Select only rows than can be selected. This is required when ALL is selected */
-  selectedRows = _.filter(selectedFlatRows, selectedRow => { return (selectedRow.original.canSelect === undefined || selectedRow.original.canSelect) });
-  /* Take only the original values passed to the component */
-  selectedRows = _.map(selectedRows, 'original');
-  /* Callback the parent function if available to pass the selected records on selection */
-  if (parentCBonSelection && selectedRows /* != selectedClickedRow && selectedRows.length != 0 */) {
-    parentCBonSelection(selectedRows)
-  }
-
-  /**
-   * Clear all filters in table and reload the data
-   */
-  const clearAllFilter = () => {
-      // Call parent function during all clear
-      if (clearAllFuncCallback) {
-        clearAllFuncCallback();
-      }
-    hasFilters = false;
-    setAllFilters([]);
-    tableOptionsState.filters = [];
-    if (doServersideFilter) {
-      filterCallback(tableOptionsState, setLoaderFunction);
-    }
-    if (storeFilter) {
-        TableUtil.clearTableFilter(currentTableName);
-    }
-  }
-  
-  return (
-    <>
-      <div style={{display:'flex',justifyContent:'space-between',height: showTopComponents?'35px':''}}>
-        <div id="block_container" >
-          {showTopComponents && allowColumnSelection &&
-            <div style={{ textAlign: 'left', marginRight: '30px' }} title='Toggle Columns'>
-              <i className="fa fa-columns col-filter-btn" label="Toggle Columns" onClick={(e) => overlayPanel.current.toggle(e)} />
-              {showColumnFilter &&
-                <div style={{ position: "relative", top: "-25px", marginLeft: "50px", color: "#005b9f" }} onClick={() => clearAllFilter()} >
-                  <i className="fas fa-sync-alt" title="Clear All Filters"></i></div>}
-              <OverlayPanel ref={overlayPanel} id="overlay_panel" showCloseIcon={false} >
-                <div>
-                  <div style={{ textAlign: 'center' }}>
-                    <label>Select column(s) to view</label>
-                  </div>
-                  <div style={{ float: 'left', backgroundColor: '#d1cdd936', width: '250px',  overflow: 'auto', marginBottom: '10px', padding: '5px', fontSize:"11px" }}>
-                    <div id="tagleid"  >
-                      <div >
-                        <div style={{ marginBottom: '5px' }}>
-                          <IndeterminateCheckbox {...getToggleHideAllColumnsProps()} onClick={(e) => onToggleChange(e)} /> Select All
-                            </div>
-                        {allColumns.map(column => (
-                          <div key={column.id+'_chk'} style={{ 'display': column.id !== 'actionpath' ? 'block' : 'none' }}>
-                            <input type="checkbox" {...column.getToggleHiddenProps()}
-                              id={(defaultheader[column.id]) ? defaultheader[column.id] : (optionalheader[column.id] ? optionalheader[column.id] : column.id)}
-                              onClick={(e) => onToggleChange(e)}
-                            /> {
-                              (defaultheader[column.id]) ? defaultheader[column.id] : (optionalheader[column.id] ? optionalheader[column.id] : column.id)}
-                          </div>
-                        ))}
-                        <br />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </OverlayPanel>
-            </div>
-          }
-          <div style={{ textAlign: 'right' }}>
-            {tbldata && tbldata.length > 0 && !isunittest && showGlobalFilter &&
-              <GlobalFilter
-                globalFilter={state.globalFilter}
-                setGlobalFilter={setGlobalFilter}
-              />
-            }
-          </div>
-
-          {showTopTotal && !hasFilters &&
-            <div className="total_records_top_label"> <label >Total records ({pageCount})</label></div>
-          }
-
-          {showTopTotal && hasFilters &&
-            <div className="total_records_top_label" ><label >Filtered {filteredData.length} from {pageCount}</label></div>}
-         
-        </div>
-        {showCSV &&
-          <div className="total_records_top_label" style={{ marginTop: '3px', marginRight: '5px' }} >
-            <a href="#" onClick={() => { exportData("csv", false); }} title="Download CSV" style={{ verticalAlign: 'middle' }}>
-              <i className="fas fa-file-csv" style={{ color: 'green', fontSize: '20px' }} ></i>
-            </a>
-          </div>
-          /* 
-            <div className="total_records_top_label" >
-              <a href="#"  onClick={() => {exportData("pdf", false);}} title="Download PDF" style={{verticalAlign: 'middle'}}>
-                  <i className="fas fa-file-pdf" style={{color: 'red', fontSize: '20px'}}></i>
-              </a>
-            </div> */
-        }
-      </div>
-      {showTopPagination &&
-      <div className="pagination p-grid  top-pagination" >
-        {tableOptionsState.filters.length === 0 &&
-          <div className="total_records_bottom_label" ><label >Total records ({pageCount})</label></div>
-        }
-        {tableOptionsState.filters.length > 0 &&
-          <div className="total_records_bottom_label" ><label >Filtered {filteredData.length} from {pageCount}</label></div>
-        }
-        <div>
-          <Paginator className="viewtablepaginator" rowsPerPageOptions={[10, 25, 50, 100]} first={currentpage} rows={currentrows} totalRecords={doServersideFilter?pageCount:rows.length} onPageChange={onPagination}></Paginator>
-        </div>
-        <div className="custom-page">
-          <InputNumber id="customPageTop" value={custompagevalue} onChange={onChangeCustompagevalue}
-            min={0} style={{ width: '100px' }} />
-          <label >Records/Page</label>
-          <Button onClick={onCustomPage} style={{  width:"100px" }}> Show </Button>
-          <Button onClick={onShowAllPage} style={{ marginLeft: "1em", width:"100px" }}> Show All </Button>
-        </div>
-      </div>
-      }
-      <div className={`tmss-table ${showTopPagination?"":"table_container"}`}>
-        <table {...getTableProps()} data-testid="viewtable" className="viewtable" >
-          <thead>
-            {headerGroups.map((headerGroup, idx) => (
-              <DragDropContext
-                key={makekey(tablename+'_'+idx+'_dd_ctx')}
-                onDragStart={() => {
-                  currentColOrder.current = allColumns.map(column => column.id);
-                }}
-                onDragUpdate={(dragUpdateObj ) => {
-                  const colOrder = [...currentColOrder.current];
-                  const sIndex = dragUpdateObj.source.index;
-                  const dIndex = dragUpdateObj.destination?.index;
-                  if(typeof sIndex === 'number' && typeof dIndex === "number") {
-                    colOrder.splice(sIndex, 1);
-                    colOrder.splice(dIndex, 0, dragUpdateObj.draggableId);
-                    setColumnOrder(colOrder);
-                    UtilService.localStore({ type: 'set', key: tablename+'colOrder', value: colOrder});
-                  }
-                }}
-              >
-                <Droppable droppableId="droppable" direction="horizontal"
-                           key={makekey(tablename+'_'+idx+'dd_drp')}>
-                  {(droppableProvided ) => (
-                    <tr {...headerGroup.getHeaderGroupProps()}
-                    ref={droppableProvided.innerRef}
-                    data-testid={'tablerows'}>
-                      {headerGroup.headers.map((column) => {
-                        if (column.id !== 'actionpath') {
-                          return (
-                            <Draggable
-                              key={makekey(tablename+'_'+idx+'_'+column.id+'dd_drg')}
-                              draggableId={column.id}
-                              index={_.findIndex(allColumns, { id: column.id })}
-                              isDragDisabled={!!_.includes(fixedColumns, column.id)}>
-                              {(provided, snapshot) => (
-                                <th role = {'tablehead'} className={_.includes(fixedColumns, column.id)?'fixed-column-td':'notfixed-column-td-'+column.id.replaceAll(' ','')} 
-                                    onClick={() => {
-                                      if(!doServersideFilter) {
-                                        if(!column.disableSortBy) {
-                                          toggleBySorting({ 'id': column.id, desc: (column.isSortedDesc !== undefined ? !column.isSortedDesc : false) });
-                                        }
-                                      }
-                                  
-                                  }}>
-                                    <div style={{display:'flex',flexDirection:'row',height:'100%'}}>
-                                  <div style={{display:'flex'}}>
-                                    <div style={{display: 'grid',verticalAlign:'bottom'}}>
-                                      <div {...column.getHeaderProps(column.getSortByToggleProps())} className={_.includes(fixedColumns, column.id)?'fixed-column':''}>
-                                        <div
-                                          {...provided.draggableProps}
-                                          {...provided.dragHandleProps}
-                                          // {...extraProps}
-                                          ref={provided.innerRef}
-                                          style={{
-                                            ...getItemStyle(
-                                              snapshot,
-                                              provided.draggableProps.style
-                                            )
-                                            // ...style
-                                          }}>
-                                          {column.Header !== 'actionpath' && column.render('Header')}
-                                          {column.Header !== 'Action' ?
-                                            column.isSorted ? (column.isSortedDesc ? <i className="pi pi-sort-down" aria-hidden="true"></i> : <i className="pi pi-sort-up" aria-hidden="true"></i>) : ""
-                                            : ""
-                                          }
-                                        </div>
-                                      </div>
-                                      {/* Render the columns filter UI */}
-                                      {column.Header !== 'actionpath' &&
-                                        <div>
-                                          {column.canFilter && column.Header !== 'Action' ? column.render('Filter') : null}
-                                        </div>
-                                      }
-
-                                  </div>
-                                  </div>
-                                  {_.includes(fixedColumns, column.id)?<></>:
-                                    <div {...column.getResizerProps()}
-                                         className={`resizer ${
-                                           column.isResizing ? 'isResizing' : ''
-                                         }`}
-                                         onMouseUp={()=> {
-                                           //On Resizing the column, store the width of the column
-                                           let colWidths = UtilService.localStore({ type: 'get', key: tablename+'_colWidth' });
-                                           if (!colWidths) {
-                                             colWidths = {};
-                                           }
-                                           colWidths[column.Header] = column.width;
-                                           UtilService.localStore({ type: 'set', key: tablename+'_colWidth', value: colWidths});
-                                         }}
-                                    >
-                                    </div>
-                                  }
-                                                                      </div>
-                                </th>
-                              )}
-                            </Draggable>
-                          );
-                        } else {
-                          return "";
-                        }
-                      })
-                      }
-                    </tr>
-                  )}
-                </Droppable>
-              </DragDropContext>
-            ))}
-            {(doServersideFilter && loading) && 
-            <tr data-testid={'tablerow'} style={{height: "5px"}}><td colSpan={columns.length} style={{padding: "0px"}}>
-            <div><ProgressBar mode="indeterminate" style={{ height: '5px' }}/></div>
-            </td></tr>}
-          </thead>
-          {/* If want to to clear the existing data while loading, remove the commented line below */}
-          {/* {((doServersideFilter && !loading) || !doServersideFilter) &&  */}
-          <tbody {...getTableBodyProps()}>
-            {page.map((row,i ) => {
-              prepareRow(row)
-              return (
-                <tr {...row.getRowProps()} data-testid={'tablerow'} className={(row.original['rowColor'])?row.original['rowColor']:''} key={makekey(i)}>
-                  {row.cells.map(cell => {
-                    if (cell.column.id !== 'actionpath') {
-                      return <td key={cell.column.id+'_'+cell.row.id} className={_.includes(fixedColumns, cell.column.id)?'fixed-column-td':'notfixed-column-td-'+cell.column.id.replaceAll(' ','')}>
-                        {(cell.row.original.links || []).includes(cell.column.id) ? <a href={cell.row.original.linksURL[cell.column.id]} target={cell.column.newTab ? "_blank":""} rel="noreferrer" >{cell.render('Cell', cell.getCellProps())}</a> : cell.render('Cell', cell.getCellProps())}
-                      </td>
-                    }
-                    else {
-                      return "";
-                    }
-                  }
-                  )}
-                </tr>
-              );
-            })}
-            
-          </tbody>
-          {/* } */}
-        </table>
-      </div>
-      <div>{(doServersideFilter && loading) && <ProgressBar mode="indeterminate" style={{ height: '5px' }}/>}</div>
-      <div className="pagination p-grid" >
-        {tableOptionsState.filters.length === 0 &&
-          <div className="total_records_bottom_label" ><label >Total records ({pageCount})</label></div>
-        }
-        {tableOptionsState.filters.length > 0 &&
-          <div className="total_records_bottom_label" ><label >Filtered {filteredData.length} from {pageCount}</label></div>
-        }
-        <div>
-          <Paginator rowsPerPageOptions={[10, 25, 50, 100]} first={currentpage} rows={currentrows} totalRecords={doServersideFilter?pageCount:rows.length} onPageChange={onPagination}></Paginator>
-        </div>
-        <div className="custom-page">
-          <InputNumber id="customPageBottom" value={custompagevalue} onChange={onChangeCustompagevalue}
-            min={0} style={{ width: '100px' }} />
-          <label >Records/Page</label>
-          <Button onClick={onCustomPage} style={{  width:"100px" }}> Show </Button>
-          <Button onClick={onShowAllPage} style={{ marginLeft: "1em", width:"100px" }}> Show All </Button>
-        </div>
-      </div>
-    </>
-  )
-}
-
-Table.propTypes = {
-  fetchData: PropTypes.func,
-  pageCount: PropTypes.any,
-  currentPage: PropTypes.any,
-  dataFetchStatus: PropTypes.any,
-  columns: PropTypes.array,
-  data: PropTypes.array,
-  defaultheader: PropTypes.any,
-  optionalheader: PropTypes.any,
-  tablename: PropTypes.string,
-  defaultSortColumn: PropTypes.any,
-  defaultpagesize: PropTypes.number,
-  columnOrders: PropTypes.array,
-  showAction: PropTypes.bool,
-  toggleBySorting: PropTypes.func,
-  lsKeySortColumn: PropTypes.string,
-  descendingColumn: PropTypes.array,
-  ignoreSorting: PropTypes.array,
-  setTableState: PropTypes.func
-}
-
-function makekey(row) {
-  return row;
-}
-// Define a custom filter filter function!
-function filterGreaterThan(rows, id, filterValue) {
-  return rows.filter(row => {
-    const rowValue = row.values[id]
-    return rowValue >= filterValue
-  })
-}
-
-// This is an autoRemove method on the filter function that
-// when given the new filter value and returns true, the filter
-// will be automatically removed. Normally this is just an undefined
-// check, but here, we want to remove the filter if it's not a number
-filterGreaterThan.autoRemove = val => typeof val !== 'number'
-
-function ViewTable(props) { 
-  const history = useHistory();
-  tbldata = JSON.parse(sessionStorage.getItem("sortedData")) || props.data;
-  data = tbldata;
-  let pageCount = props.totalPage || data?.length;
-  showCSV = (props.showCSV) ? props.showCSV : false;
-  showActionInNewTab = (props.showActionInNewTab) ? props.showActionInNewTab : false;
-  doServersideFilter = !!(props.callBackFunction);
-  parentCallbackFunction = props.filterCallback;
-  parentCBonSelection = props.onRowSelection;
-  isunittest = props.unittest;
-  loadingStatus = props.loadingStatus === undefined ? loadingStatus :  props.loadingStatus;
-  showTopTotal = props.showTopTotal === undefined ? true : props.showTopTotal;
-  showGlobalFilter = props.showGlobalFilter === undefined ? true : props.showGlobalFilter;
-  showColumnFilter = props.showColumnFilter === undefined ? true : props.showColumnFilter;
-  allowColumnSelection = props.allowColumnSelection === undefined ? true : props.allowColumnSelection;
-  showTopComponents = props.showTopComponents === undefined ? true : props.showTopComponents;
-  allowRowSelection = props.allowRowSelection === undefined ? false : props.allowRowSelection;
-  isOnlySingleRowAllowed = props.isOnlySingleRowAllowed === undefined ? false : props.isOnlySingleRowAllowed;
-  showTopPagination = props.showTopPagination === undefined ? false : props.showTopPagination;
-  let pageUpdated = props.pageUpdated === undefined ? true : props.pageUpdated;
-
-  // Default Header to show in table and other columns header will not show until user action on UI
-  clearAllFuncCallback = props.clearAllFuncCallback;
-  tableInstanceRef = props.tableInstanceRef;
-  let defaultheader = props.defaultcolumns;
-  let optionalheader = props.optionalcolumns;
-  let defaultSortColumn = props.defaultSortColumn;
-  storeFilter = props.storeFilter? props.storeFilter : false
-  let tablename = (props.tablename) ? props.tablename : window.location?.pathname;
-
-  if (!defaultSortColumn) {
-    defaultSortColumn = [{}];
-  }
-  let defaultpagesize = (typeof props.defaultpagesize === 'undefined' || props.defaultpagesize == null) ? 10 : props.defaultpagesize;
-  let columns = [];
-  let defaultdataheader = Object.keys(defaultheader[0]);
-  let optionaldataheader = Object.keys(optionalheader[0]);
-
-  // Get Tooltips for each column if provided and used in filter components
-  tableToolTipsState = {};
-  for(const headerId of defaultdataheader) {
-      if (defaultheader[0][headerId].tooltip) {
-          tableToolTipsState[defaultheader[0][headerId].name] = defaultheader[0][headerId].tooltip;
-      }
-   }
-  for(const headerId of optionaldataheader) {
-    if (optionalheader[0][headerId].tooltip) {
-        tableToolTipsState[optionalheader[0][headerId].name] = optionalheader[0][headerId].tooltip;
-    }
-  }
-
-  /* If allowRowSelection property is true for the component, add checkbox column as 1st column.
-     If the record has property to select, enable the checkbox */
-  if (allowRowSelection) {
-    columns.push({
-      Header: ({ getToggleAllRowsSelectedProps }) => {
-     
-        if (isOnlySingleRowAllowed) {
-          return <div></div>
-        }
-        return (
-          <div>
-            <IndeterminateCheckbox {...getToggleAllRowsSelectedProps()} style={{ width: '15px', height: '15px' }} />
-          </div>
-        )
-      },
-      id: 'Select',
-      accessor: props.keyaccessor,
-      Cell: ({ row }) => {     
-        return (
-          <div>
-        {(isOnlySingleRowAllowed)  &&
-         <IndeterminateRadioButton {...row.getToggleRowSelectedProps()} 
-            attr-id={row.original.id}
-            name="SelectionRadio"
-            style={{ width: '15px', height: '15px' }} />
-        }          
-          {(!isOnlySingleRowAllowed && row.original.canSelect === undefined || row.original.canSelect) &&
-              <IndeterminateCheckbox {...row.getToggleRowSelectedProps()} 
-              attr-id={row.original.id}
-              style={{ width: '15px', height: '15px' }} />
-            }
-            { (row.original.canSelect === false&&!isOnlySingleRowAllowed) && 
-              <input type="checkbox" checked={false} disabled style={{ width: '15px', height: '15px' }}></input>
-            }
-          
-          </div>
-        )
-      },
-      disableFilters: true,
-      disableSortBy: true,
-      isVisible: true,
-    });
-  }
-
-  if (props.showaction) {
-    columns.push({
-      Header: 'Action',
-      id: 'Action',
-      accessor: props.keyaccessor,
-      Cell: props => {
-
-        if (typeof props.cell.row.values['actionpath'] === 'string') {
-          return  <Link target={showActionInNewTab?"_blank": ""}      to={{pathname: props.cell.row.values['actionpath']}} className='p-link' onClick={(e) => navigateTo(e )} >    <i className="pi pi-eye" style={{ cursor: 'pointer' }}></i>    </Link>
-        }
-        
-         return (
-          <div style={{ display:"flex"}}>
-            <Link target={showActionInNewTab?"_blank": ""}      to={{pathname: props.cell.row.values['actionpath'][0]}} className='p-link' onClick={(e) => navigateTo(e )} >    <i className="pi pi-eye" style={{ cursor: 'pointer' }}></i>    </Link>
-            <Link  style={{ marginLeft:"5px"}} target={"_blank"}       to={{pathname: props.cell.row.values['actionpath'][1]}} className='p-link' onClick={(e) => navigateTo(e )} >    <i className="pi pi-calendar" style={{ cursor: 'pointer' }}></i>    </Link>
-          </div>)
-        
-      }
-        ,
-      disableFilters: true,
-      disableSortBy: true,
-      //isVisible: defaultdataheader.includes(props.keyaccessor),
-      isVisible: true
-    })
-  }
-
-  const navigateTo = ( cellProps) =>() => {
-    if (cellProps.cell.row.values['actionpath']) {
-      if (!props.viewInNewWindow) {
-        return history.push({
-          pathname: cellProps.cell.row.values['actionpath'],
-          state: {
-            "id": cellProps.value,
-          }
-        })
-      } else {
-        window.open(cellProps.cell.row.values['actionpath'], '_blank');
-      }
-    }
-    else {
-      props.actionCallback(cellProps.cell.row.values);
-    }
-  }
-  //Get the object stored with column width for the table
-  let colWidths = UtilService.localStore({ type: 'get', key: tablename+'_colWidth' });
-  colWidths = colWidths || {};
-  //Default Columns
-
-  defaultdataheader.forEach(header => {
-    const isString = typeof defaultheader[0][header] === 'string';
-    const disableSortBy = defaultheader[0][header].disableSortBy;
-    const disableFilter = defaultheader[0][header].disableFilters;
-    const filterFn = (showColumnFilter ? (isString ? (defaultheader[0][header].filter==='none'?"":DefaultColumnFilter) : (filterTypes[defaultheader[0][header].filter]?.fn ? filterTypes[defaultheader[0][header].filter].fn : (defaultheader[0][header].filter==='none'?"":DefaultColumnFilter))) : "");
-    const filtertype = (showColumnFilter ? (!isString && filterTypes[defaultheader[0][header].filter]?.type) ? filterTypes[defaultheader[0][header].filter].type : 'fuzzyText' : "");
-    let column = {
-      Header: isString ? defaultheader[0][header] : defaultheader[0][header].name,
-      id: isString ? defaultheader[0][header] : defaultheader[0][header].name,
-      accessor: header,
-      filter: filtertype,
-      Filter: filterFn,
-      newTab: defaultheader[0][header] ? defaultheader[0][header].newTab: false,
-      disableSortBy: doServersideFilter?(typeof disableSortBy !== 'undefined' ? disableSortBy : true):(disableSortBy || false),
-      disableFilters: doServersideFilter?typeof disableFilter !== 'undefined' ? disableFilter : true:false,
-      isVisible: true,
-      Cell: props => { return <div style={{...props.style}}> {updatedCellvalue(header, props.value, defaultheader[0][header])} </div>},
-    };
-    const headerName = defaultheader[0][header].name || defaultheader[0][header];
-    // Set the width of the column from the stored value
-    if(colWidths[headerName]) {
-      column.width = colWidths[headerName];
-    }
-    columns.push(column);
-  });
-
-  //Optional Columns
-  optionaldataheader.forEach(header => {
-    const isString = typeof optionalheader[0][header] === 'string';
-    const disableSortBy = optionalheader[0][header].disableSortBy;
-    const disableFilter = optionalheader[0][header].disableFilters;
-    const filterFn = (showColumnFilter ? (isString ? (optionalheader[0][header].filter==='none'?"":DefaultColumnFilter) : (filterTypes[optionalheader[0][header].filter] && filterTypes[optionalheader[0][header].filter].fn ? filterTypes[optionalheader[0][header].filter].fn : (optionalheader[0][header].filter==='none'?"":DefaultColumnFilter))) : "");
-    const filtertype = (showColumnFilter ? (!isString && filterTypes[optionalheader[0][header].filter]) ? (filterTypes[optionalheader[0][header].filter].type || filterTypes[optionalheader[0][header].filter]) : 'fuzzyText' : "");
-    let column = {
-      Header: isString ? optionalheader[0][header] : optionalheader[0][header].name,
-      id: isString ? header : optionalheader[0][header].name,
-      accessor: header,
-      filter: filtertype,
-      Filter: filterFn,
-      newTab: optionalheader[0][header] ? optionalheader[0][header].newTab: false,
-      disableSortBy: doServersideFilter?typeof disableSortBy !== 'undefined' ? disableSortBy : true:false,
-      disableFilters: doServersideFilter?typeof disableFilter !== 'undefined' ? disableFilter : true:false,
-      isVisible: false,
-      Cell: props => <div style={{...props.style}}> {updatedCellvalue(header, props.value, optionalheader[0][header])} </div>,
-    };
-    const headerName = optionalheader[0][header].name || optionalheader[0][header];
-    // Set the width of the column from the stored value
-    if(colWidths[headerName]) {
-      column.width = colWidths[headerName];
-    }
-    columns.push(column);
-  });
-
-  let togglecolumns = localStorage.getItem(tablename);
-  if (togglecolumns) {
-    togglecolumns = JSON.parse(togglecolumns);
-    columns.forEach(column => {
-      let tcolumn = _.find(togglecolumns, { Header: column.Header });
-      column['isVisible'] = (tcolumn) ? tcolumn.isVisible : column.isVisible;
-    });
-  }
-
-  function updatedCellvalue(key, value, properties) {
-    
-    try {
-      if (typeof value == "boolean") {
-        return value.toString();
-      } else if (typeof value == "string") {
-        const format = properties ? properties.format : 'YYYY-MM-DD HH:mm:ss';
-        const dateval = moment(value, moment.ISO_8601).format(format);
-        if (dateval !== 'Invalid date') {
-          return dateval;
-        }
-      }
-      if (properties.showTag) {
-        let tagClass = properties.tagClass? _.replace(properties.tagClass, '$dynamic$', value):'';
-        value = <div className="tag-cell"> 
-                  <span className={"tag-content p-chips-token-label "+tagClass } >{value}</span>
-                </div>
-      }
-
-    } catch (err) {
-      console.error('Error', err)
-    }
-    return value;
-  }
-
-  /**
-   * To fetch data from server side - Start
-   */
-  const [currentPage, setCurrentPage] = React.useState(0);
-  const fetchData = React.useCallback( ({ state, setLoading }) => {
-      loadServerData(state, setLoading, true);
-  }, []);
-  
-  const loadServerData = (state, setLoading, onload) => {
-      loadingStatus = true;
-      setCurrentPage(state.pageIndex);
-      if(props.callBackFunction) {
-        if(storeFilter) {
-          if (onload) {
-            let filters = UtilService.localStore({ type: 'get', key: tablename });
-            UtilService.localStore({ type: 'set', key: tablename, value: filters});    
-          } else {
-            UtilService.localStore({ type: 'set', key: tablename, value: state.filters});    
-          }
-        }
-          const promises = [props.callBackFunction(state)];
-          Promise.all(promises).then(async responses => {
-              tbldata = responses[0][0];
-              if (tbldata) {
-                  pageCount = await Math.ceil(responses[0][1]);
-                  if (setLoading) {
-                    setLoading(false);
-                  }
-                  loadingStatus = false;
-              }
-          });
-      } else if(tbldata) {
-              const startRow = state.pageSize * state.pageIndex;
-              const endRow = startRow + state.pageSize;
-              data = tbldata.slice(startRow, endRow);
-              pageCount = Math.ceil(tbldata.length);
-              setLoading(false);
-              loadingStatus = false;
-          }
-      
-  }
-  // Set the filterCallback function to load on filter changes
-  filterCallback = loadServerData;
-  // Set the reloadCallback function in the parent if it has passed the callback function.
-  if (props.setTableReloadFunction) {
-    props.setTableReloadFunction(loadServerData);
-  }
-  // Callback function to load on option list values
-  showFilterOption = props.showFilterOption;
-  
-  //If page not load with fresh data then set existing data, otherwise it will reset the checkbox selection in table
-  if (!pageUpdated) {
-      data = tmpTableData;
-  } 
-  return (
-    <div>
-      <Table fetchData={fetchData} pageCount={pageCount} currentPage={currentPage} dataFetchStatus={loadingStatus} columns={columns}  
-        data={data} defaultheader={defaultheader[0]} optionalheader={optionalheader[0]} showAction={props.showaction}
-        defaultSortColumn={defaultSortColumn} tablename={tablename} defaultpagesize={defaultpagesize} columnOrders={props.columnOrders} 
-        toggleBySorting={(sortData) => {if(props.toggleBySorting){props.toggleBySorting(sortData)}}} onColumnToggle={props.onColumnToggle} lsKeySortColumn={props.lsKeySortColumn}
-        descendingColumn={props.descendingColumn} ignoreSorting={props.ignoreSorting} setTableState={props.setTableState} />
-    </div>
-  )
-}
-
-ViewTable.propTypes = {
-  data: PropTypes.any,
-  totalPage: PropTypes.any,
-  showCSV: PropTypes.any,
-  showActionInNewTab: PropTypes.any,
-  callBackFunction: PropTypes.func,
-  filterCallback: PropTypes.any,
-  onRowSelection: PropTypes.any,
-  unittest: PropTypes.any,
-  loadingStatus: PropTypes.any,
-  showTopTotal: PropTypes.any,
-  showGlobalFilter: PropTypes.any,
-  showColumnFilter: PropTypes.any,
-  allowColumnSelection: PropTypes.any,
-  showTopComponents: PropTypes.any,
-  allowRowSelection: PropTypes.any,
-  isOnlySingleRowAllowed: PropTypes.any,
-  showTopPagination: PropTypes.any,
-  pageUpdated: PropTypes.any,
-  clearAllFuncCallback: PropTypes.any,
-  tableInstanceRef: PropTypes.any,
-  defaultcolumns: PropTypes.any,
-  optionalcolumns: PropTypes.any,
-  defaultSortColumn: PropTypes.any,
-  storeFilter: PropTypes.any,
-  tablename: PropTypes.any,
-  defaultpagesize: PropTypes.any,
-  keyaccessor: PropTypes.any,
-  showaction: PropTypes.any,
-  cell: PropTypes.shape({
-    row: PropTypes.shape({
-      values: PropTypes.any
-    })
-  }),
-  viewInNewWindow: PropTypes.any,
-  actionCallback: PropTypes.func,
-  style: PropTypes.any,
-  value: PropTypes.any,
-  setTableReloadFunction: PropTypes.func,
-  showFilterOption: PropTypes.any,
-  columnOrders: PropTypes.any,
-  toggleBySorting: PropTypes.func,
-  onColumnToggle: PropTypes.any,
-  lsKeySortColumn: PropTypes.any,
-  descendingColumn: PropTypes.any,
-  ignoreSorting: PropTypes.any,
-  setTableState: PropTypes.any
-}
-
-export default ViewTable
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExt.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExt.js
index 679767d07fdfd678d84e4f36a4344cf90c6ec9a2..2984015196c2312d94baa276f7babef8a60dfc6c 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExt.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExt.js
@@ -377,8 +377,11 @@ export const ViewTableExt = forwardRef((props, ref) => {
                     columnProps.style = { minWidth: '220px' };
                     break;
                 case "filter-input-100":
-                    columnProps.style = { minWidth: '120px' };
+                    columnProps.style = { minWidth: '140px' };
                     break;
+                case "filter-input-150":
+                        columnProps.style = { minWidth: '180px' };
+                        break;
                 case "filter-input-75":
                     columnProps.style = { minWidth: '100px' };
                     break;
@@ -508,7 +511,6 @@ export const ViewTableExt = forwardRef((props, ref) => {
         onSelectionChange={
             (e) => {
                 setSelectedRows(e.value)
-                console.log("SelectionChange", e.value)
                 if (onRowSelection) onRowSelection(e.value)
             }
         }
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExtBusiness.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExtBusiness.js
index 0d9bbc1af63a546997d50e17b368b20065785de0..13f2161c1bd1e99e99ad24338794ceefa17de7e6 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExtBusiness.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExtBusiness.js
@@ -92,7 +92,35 @@ export function AddCommaSeperatedInput(query, filter) {
     
 }
 
+export function prepareQuery(tablestate) {
+    let newOrderBy = "";
+    let filterQry = "";
+    if (tablestate?.filters) {
+        let filters = Object.entries(tablestate.filters);
+        if (filters.length > 0) {
+            for (const keyvaluefilter of filters) {
+                let filter = keyvaluefilter[1];
+                if (filter.value == null || filter.value == "") continue;
+                let isHandled = false;
+                ({ filterQry, isHandled } = GetBaseQueries(filter, filterQry, isHandled));
+                if (!isHandled) {
+                    console.log("filter" + filter.key + " is not handled");
+                }
+            }
+        }
+        newOrderBy = getSort(tablestate, newOrderBy);
+    }
+    return { filterQry, newOrderBy };
+}
 
+function getSort(tablestate, newOrderBy) {
+    if (tablestate?.sortField) {
+        let sortColumn = tablestate.filters?.[tablestate.sortField]?.column;
+        let sortfield = sortColumn?.querykey || tablestate.sortField;
+        newOrderBy = 'ordering=' + ((tablestate.sortOrder == 1) ? '-' : '') + sortfield;
+    }
+    return newOrderBy;
+}
 
 export function GetBaseQueries(filter, filterQry, isHandled) {
     switch (filter.column.filter) {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/Business/reservation.columns.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/Business/reservation.columns.js
new file mode 100644
index 0000000000000000000000000000000000000000..a18ba317948cfc2d83068d892e25da79ae01879a
--- /dev/null
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/Business/reservation.columns.js
@@ -0,0 +1,150 @@
+import UIConstants from "../../../utils/ui.constants";
+
+export const ReservationColumns = () => 
+[{
+    id: { name: "Id" ,
+        disableFilters:false,
+        disableSortBy:false },
+    name: { 
+        name: "Name" ,
+        disableFilters:false,
+        disableSortBy:false,
+    },
+    cycle: { 
+        name: "Cycle" ,
+        disableFilters:false,
+        filter: "select"
+    },
+    description: {
+         name: "Description",
+         disableFilters:false, 
+         disableSortBy:false
+        },
+    start_time: {
+        name: "Start Time",
+        filter: "flatpickrDateRange",
+        format: UIConstants.CALENDAR_DATETIME_FORMAT,
+        disableSortBy:false
+    },  
+    stop_time: {
+        name: "End Time",
+        filter: "flatpickrDateRange",
+        format: UIConstants.CALENDAR_DATETIME_FORMAT,
+        disableSortBy:false
+    },
+    duration: {
+        name: "Duration (Days HH:mm:ss)",
+        disableFilters:true,
+        format: UIConstants.CALENDAR_TIME_FORMAT,
+        filter: "durationWithDaysMinMax",
+    },
+    reservation_type: {
+        name: "Reservation Type",
+        filter: "select"
+    },
+    subject: {
+        name: "Subject",
+        filter: "select"
+    },
+    planned: {
+        name: "Planned",
+        filter: "switch"
+    },
+    stations_any: {
+        name: "Stations",
+        filter: "multiselect-filter"
+    },
+    fixed_time: {
+        name: "Fixed Time",
+        filter: "switch"
+    },
+    dynamic: {
+        name: "Dynamic",
+        filter: "switch"
+    },
+    project_exclusive: {
+        name: "Fixed project",
+        filter: "switch"
+    },
+    projects: {
+        name: "Projects",
+        filter: "multiselect-filter"
+    },
+    expert: {
+        name: "Expert",
+        filter: "switch"
+    },
+    hba_rfi: {
+        name: "HBA-RFI",
+        filter: 'switch'
+    },
+    lba_rfi: {
+        name: "LBA-RFI",
+        filter: 'switch'
+    },
+    created_at: {
+        name: "Created at",
+        disableFilters:true,
+        filter: "flatpickrDateRange",
+        format: UIConstants.CALENDAR_DATETIME_FORMAT
+    },
+    updated_at: {
+        name: "Updated at",
+        disableFilters:true,
+        filter: "flatpickrDateRange",
+        format: UIConstants.CALENDAR_DATETIME_FORMAT
+    },
+    
+}]
+
+
+
+export const ReservationColumnsClasses = () => 
+
+[{
+    "Id": "filter-input-100",
+    "Description": "filter-input-100",
+    "Duration (Days HH:mm:ss)": "filter-input-150",
+    "Reservation type": "filter-input-100",
+    "Subject": "filter-input-75",
+    "Planned": "filter-input-50",
+    "Stations": "filter-input-150,multi-select",
+    "FixedTime": "filter-input-50",
+    "Dynamic": "filter-input-50",
+    "Fixed project": "filter-input-50",
+    "Expert": "filter-input-50",
+    "HBA-RFI": "filter-input-50",
+    "LBA-RFI": "filter-input-50",
+    "Start Time": "filter-input-150",
+    "End Time": "filter-input-150",
+    "Created at": "filter-input-150",
+    "Updated at": "filter-input-150",
+    "Projects": "filter-input-150",
+    "Name": "filter-input-150",
+    "Cycle": "filter-input-100",
+    
+}]
+
+export const ReservationColumnsOrder = () => [
+
+    "Id",
+    "Name",
+    "Description",
+    "Cycle",
+    "Start Time",
+    "End Time",
+    "Duration (Days HH:mm:ss)",
+    "Reservation Type",
+    "Subject",
+    "Planned",
+    "Stations",
+    "FixedTime",
+    "Dynamic",
+    "Fixed project",
+    "Projects",
+    "Expert",
+    "HBA-RFI",
+    "LBA-RFI",
+    "Created at",
+    "Updated at"
+]
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/Business/reservation.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/Business/reservation.js
new file mode 100644
index 0000000000000000000000000000000000000000..6535a334be03fc6d3d525298d8848f1f94961c03
--- /dev/null
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/Business/reservation.js
@@ -0,0 +1,61 @@
+import { UnitConverter } from "@astron-sd/telescope-specification";
+import moment from "moment";
+import UIConstants from "../../../utils/ui.constants";
+
+const mergeResourceWithReservation =(reservation, params)=> {
+    if (params) {
+        Object.keys(params).map((key) => (
+            ['name', 'description'].indexOf(key) < 0 ? reservation[key] = params[key] : ''
+        ));
+    }
+    return reservation;
+}
+
+const GetCycleForDate =(reservation,cycles)=> {
+    if ( reservation["cycle"]!=undefined ) return  reservation["cycle"];
+    const starttime = moment(reservation["start_time"])
+    for(const xcycle in cycles) {
+        let cycle = cycles[xcycle]
+        if (starttime.isBetween(cycle["start_tick"],cycle["stop_tick"]))
+        {
+            return cycle.name;
+        }
+    }
+    return undefined;
+}
+
+export const updateReservation =(reservation, response,cycles)=> {
+    reservation = mergeResourceWithReservation(reservation, response.specifications_doc.activity);
+    reservation = mergeResourceWithReservation(reservation, response.specifications_doc.effects);
+    reservation = mergeResourceWithReservation(reservation, response.specifications_doc.schedulability);
+    reservation['reservation_type'] = reservation.type;
+    
+    if (reservation.projects_ids) {
+        reservation['projects'] = reservation.projects_ids.join(', ');
+    } else {
+        reservation['projects'] = '';
+    }
+
+    if (response.specifications_doc.resources.stations) {
+        reservation['stations_any'] = response.specifications_doc.resources.stations.join(', ');
+    } else {
+        reservation['stations_any'] = '';
+    }
+
+    if (reservation['stop_time']) {
+        reservation.duration = UnitConverter.getSecsToDDHHmmss(reservation.duration);
+        reservation['stop_time'] = moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
+    }
+
+    if (reservation['start_time']) {
+        reservation['start_time'] = moment(reservation['start_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
+        reservation['cycle']= GetCycleForDate(reservation,cycles)
+    }
+    reservation['actionpath'] = `/reservation/view/${reservation.id}`;
+    reservation['canSelect'] = true;
+    
+    
+    return reservation;
+}
+
+
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
index fb57edf63ee6fcf8c05f75f4a8882cbe044d0659..b4f6d632fa03048ddb33e0f40b3a84645a547a4e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
@@ -1,599 +1,197 @@
 import PropTypes from 'prop-types';
-import React, { Component } from 'react';
+import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
-import moment from 'moment';
 import { DataTable } from 'primereact/datatable';
-import { Calendar } from 'primereact/calendar';
 import { Column } from 'primereact/column';
-import { Dropdown } from 'primereact/dropdown';
-import { Panel } from 'primereact/panel';
-import { Button } from 'primereact/button';
-
 import { CustomDialog } from '../../layout/components/CustomDialog';
 import { appGrowl } from '../../layout/components/AppGrowl';
-import AppLoader from "../../layout/components/AppLoader";
-import ViewTable from '../../components/ViewTable/ViewTable';
 import PageHeader from '../../layout/components/PageHeader';
 
-import {UnitConverter,Validator}  from '@astron-sd/telescope-specification';
-import UIConstants from '../../utils/ui.constants';
 import ReservationService from '../../services/reservation.service';
 import CycleService from '../../services/cycle.service';
-import UtilService from '../../services/util.service';
+
 import AuthStore from '../../authenticate/auth.store';
 import AuthUtil from '../../utils/auth.util';
 import AccessDenied from '../../layout/components/AccessDenied';
 
-import Websocket from 'react-websocket';
-
-export class ReservationList extends Component {
-    lsKeySortColumn = "ReservationListSortData";
-    constructor(props) {
-        super(props);
-        this.state = {
-            validFields: {},
-            fStartTime: '',
-            fEndTime: '',     // Filter End Time
-            reservationsList: [],
-            cycle: '',
-            errors: {},
-            syncWithCalendar: true,   // Filter Start time
-            dialog: {},
-            defaultcolumns: [{
-                name: { name: "System Id" },
-                description: { name: "Description" },
-                start_time: {
-                    name: "Start Time",
-                    filter: "flatpickrDateRange",
-                    format: UIConstants.CALENDAR_DATETIME_FORMAT
-                },
-                stop_time: {
-                    name: "End Time",
-                    filter: "flatpickrDateRange",
-                    format: UIConstants.CALENDAR_DATETIME_FORMAT
-                },
-                duration: {
-                    name: "Duration (Days HH:mm:ss)",
-                    format: UIConstants.CALENDAR_TIME_FORMAT,
-                    filter: "durationWithDaysMinMax",
-                },
-                reservation_type: {
-                    name: "Reservation Type",
-                    filter: "select"
-                },
-                subject: {
-                    name: "Subject",
-                    filter: "select"
-                },
-                planned: {
-                    name: "Planned",
-                    filter: "switch"
-                },
-                stations: {
-                    name: "Stations",
-                    filter: "multiselect"
-                },
-                fixed_time: {
-                    name: "FixedTime",
-                    filter: "switch"
-                },
-                dynamic: {
-                    name: "Dynamic",
-                    filter: "switch"
-                },
-                project_exclusive: {
-                    name: "Fixed project",
-                    filter: "switch"
-                },
-                projects: {
-                    name: "Projects",
-                    filter: "multiselect-filter"
-                },
-                expert: {
-                    name: "Expert",
-                    filter: "switch"
-                },
-                hba_rfi: {
-                    name: "HBA-RFI",
-                    filter: 'switch'
-                },
-                lba_rfi: {
-                    name: "LBA-RFI",
-                    filter: 'switch'
-                },
-                created_at: {
-                    name: "Created at",
-                    filter: "flatpickrDateRange",
-                    format: UIConstants.CALENDAR_DATETIME_FORMAT
-                },
-                updated_at: {
-                    name: "Updated at",
-                    filter: "flatpickrDateRange",
-                    format: UIConstants.CALENDAR_DATETIME_FORMAT
-                },
-                actionpath: "actionpath"
-            }],
-            optionalcolumns: [{
-                id: { name: "ID" },
-
-            }],
-            columnclassname: [{
-                "ID": "filter-input-50",
-                "System Id": "filter-input-100",
-                "Description": "filter-input-100",
-                "Duration (Days HH:mm:ss)": "filter-input-150",
-                "Reservation type": "filter-input-100",
-                "Subject": "filter-input-75",
-                "Planned": "filter-input-50",
-                "Stations": "filter-input-150,multi-select",
-                "FixedTime": "filter-input-50",
-                "Dynamic": "filter-input-50",
-                "Fixed project": "filter-input-50",
-                "Expert": "filter-input-50",
-                "HBA-RFI": "filter-input-50",
-                "LBA-RFI": "filter-input-50",
-                "Start Time": "filter-input-150",
-                "End Time": "filter-input-150",
-                "Created at": "filter-input-150",
-                "Updated at": "filter-input-150",
-            }],
-            columnOrders: [
-                "ID",
-                "System Id",
-                "Description",
-                "Start Time",
-                "End Time",
-                "Duration (Days HH:mm:ss)",
-                "Reservation Type",
-                "Subject",
-                "Planned",
-                "Stations",
-                "FixedTime",
-                "Dynamic",
-                "Fixed project",
-                "Projects",
-                "Expert",
-                "HBA-RFI",
-                "LBA-RFI",
-                "Created at",
-                "Updated at"
-            ],
-            defaultSortColumn: [{ id: "System Id", desc: false }],
-            isLoading: true,
-            cycleList: [],
-            userrole: AuthStore.getState()
-        }
-        this.reservationTypeOptionList = [];
-        this.subjectsOptionList = [];
-        this.projects =[];
-        this.stationList = [];
-        this.filterQry = '';
-        this.orderBy = '';
-        this.limit = 10;
-        this.offset = 0;
-        this.currentPageSize = 10;
-        this.tableInstance = null;
-        this.reservations = [];
-        this.cycleList = [];
-        this.selectedRows = [];
-        this.totalPage = 0;
-        this.pageUpdated = true;
-        this.onRowSelection = this.onRowSelection.bind(this);
-        this.confirmDeleteReservations = this.confirmDeleteReservations.bind(this);
-        this.deleteReservations = this.deleteReservations.bind(this);
-        this.closeDialog = this.closeDialog.bind(this);
-        this.getReservationDialogContent = this.getReservationDialogContent.bind(this);
-        this.closeList = this.closeList.bind(this);
-        this.fetchTableData = this.fetchTableData.bind(this);
-        this.getFilterOptions = this.getFilterOptions.bind(this);
-        this.resetStartDateTime = this.resetStartDateTime.bind(this);
-        this.resetEndDateTime = this.resetEndDateTime.bind(this);
-        this.clearAllFilter = this.clearAllFilter.bind(this);
-        this.seTableInstanceRef = this.seTableInstanceRef.bind(this);
-        this.setDateRange = this.setDateRange.bind(this);
-        this.onConnect = this.onConnect.bind(this);
-        this.handleData = this.handleData.bind(this);
-        this.refreshReservationList = this.refreshReservationList.bind(this);
-        this.updateReservation = this.updateReservation.bind(this);
-    }
-    setFromRedirection = async () => {
 
-        if (this.props.match?.params?.fromdate && this.props.match?.params?.todate) {
-            try {
-                const fromDate = new Date(this.props.match.params.fromdate)
-                const toDate = new Date(this.props.match.params.todate)
-                this.setState({ fStartTime: fromDate, fEndTime: toDate });
-
-
-
-                let filters = []
-                let reservedTimeFilter = [{ 'id': 'Start Time', value: ['', moment(new Date(toDate)).format("YYYY-MM-DDTHH:mm:ss")] }];
-                reservedTimeFilter.push({ 'id': 'End Time', value: [moment(new Date(fromDate)).format("YYYY-MM-DDTHH:mm:ss", '')] });
-                filters = [...reservedTimeFilter];
-                this.setTableProperty(filters, 'Filter');
-                UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters });
-                await this.fetchTableData(null);
-                this.pageUpdated = true;
-
-            }
-            catch (ex) { return false }
-        }
-        return true
-    }
+import { ReservationColumns, ReservationColumnsClasses, ReservationColumnsOrder } from './Business/reservation.columns';
+import { ViewTableExt } from '../../components/ViewTable/ViewTableExt';
+import { useParsedDataWebSocket } from '../../utils/websocket';
+import { AddDateRangeQuery,  prepareQuery } from '../../components/ViewTable/ViewTableExtBusiness';
+import { updateReservation } from './Business/reservation';
+import ProjectService from '../../services/project.service';
+import moment from 'moment';
+import AppLoader from '../../layout/components/AppLoader';
 
+const paths = [{
+    "View": "/reservation/view",
+}]
 
-    init = async () => {
-        this.setToggleBySorting();
-        await this.getFilterColumns();
 
-        this.prepareLoading()
-        this.setState({
-            isLoading: false,
-            cycleList: this.cycleList,
-            reservationsList: this.reservations,
-        });
-    }
+export function ReservationList(props) {
+    const lsKeySortColumn = "ReservationListSortData";
+    const [tableState, setTableState] = useState();
+    const [reservationsList, setReservationsList] = useState('')
+    const [dialog, setDialog] = useState({})
+    const [dialogVisible, setDialogVisible] = useState(false)
+    const [defaultColumns, setDefaultColumns] = useState(ReservationColumns());
+    const optionalColumns = [{}]
+    const columnclassname = ReservationColumnsClasses();
+    const defaultSortColumn = [{ id: "System Id", desc: false }]
+    const columnOrders = ReservationColumnsOrder()
+    const [isLoading, setIsLoading] = useState(true);
+    const [loadingStatus, setLoadingStatus] = useState(true);
 
-    componentDidMount() {
-        this.init();
-    }
+    const [cycleList, setCycleList] = useState([]);
+    const [userrole, setUserrole] = useState(AuthStore.getState());
+    const tablename = props?.match?.params?.fromdate ? "reservation_list_prefiltred" : "reservation_list";
 
 
-    prepareLoading = async () => {
-        if (this.cycleList.length == 0) {
-            this.cycleList = await CycleService.getAllCycles();
-        }
-        let setFromRedirection = await this.setFromRedirection();
+    let reservationTypeOptionList = [];
 
-        if (setFromRedirection) {
-            await this.fetchTableData(null);
-            this.pageUpdated = true;
-            return
-        }
+    const [subjectsOptionList, setSubjectsOptionList] = useState([]);
+    const [projects, setProjects] = useState([]);
+    const [stationList, setStationList] = useState([]);
+    const [selectedRows, setSelectedRows] = useState([]);
+    const [totalPage, setTotalPage] = useState(0);
+    const [pageUpdated, setPageUpdated] = useState(true);
 
-        this.setLocalFilters();
 
+    const setFromRedirection = async () => {
 
-    }
-    /**
-     * Set Top filters when the state changed or while init the page
-     */
-    setLocalFilters() {
-        let filters = UtilService.localStore({ type: 'get', key: "reservation_list" });
-        if (filters) {
-            let filter = _.find(filters, { 'id': 'CycleId' });
-            if (filter) {
-                this.setState({ cycle: filter.value });
-            }
-            filter = _.find(filters, { 'id': 'Start Time' });
-            if (filter) {
-                const values = filter.value;
-                this.setState({ fStartTime: new Date(values[0]) });
-            } else {
-                this.setState({ fStartTime: '', cycle: '' });
-            }
-            filter = _.find(filters, { 'id': 'End Time' });
-            if (filter) {
-                const values = filter.value;
-                this.setState({ fEndTime: values.length === 2 ? new Date(values[1]) : new Date(values[0]) });
-            } else {
-                this.setState({ fEndTime: undefined, cycle: '' });
-            }
-        }
-        let filterStartTime = _.find(filters, function (filter) {
-            return (filter.id === 'Start Time' && filter.value.length > 0);
-        });
-        let filterEndTime = _.find(filters, function (filter) {
-            return (filter.id === 'End Time' && filter.value.length > 0)
-        });
-        if (!filterStartTime && !filterEndTime) {
-            this.setState({ cycle: '' });
-        }
-    }
-
-    toggleBySorting = (sortData) => {
-        UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: sortData });
-    }
-
-    setToggleBySorting() {
-        let sortData = UtilService.localStore({ type: 'get', key: this.lsKeySortColumn });
-        if (sortData) {
-            if (Object.prototype.toString.call(sortData) === '[object Array]') {
-                this.defaultSortColumn = sortData;
+        if (props.match?.params?.fromdate && props.match?.params?.todate) {
+            try {
+                const fromDate = new Date(props.match.params.fromdate)
+                const toDate = new Date(props.match.params.todate)
+                let newdefaults = _.clone(defaultColumns);
+                newdefaults[0]["start_time"].defaultvalue = [fromDate, toDate]
+                newdefaults[0]["start_time"].disableFilters = true
+                newdefaults[0]["stop_time"].defaultvalue = [fromDate, toDate]
+                newdefaults[0]["stop_time"].disableFilters = true
+                setDefaultColumns(newdefaults);
             }
-            else {
-                this.defaultSortColumn = [{ ...sortData }];
+            catch (ex) {
+                return false
             }
         }
-        this.defaultSortColumn = this.defaultSortColumn || [];
-        UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: [...this.defaultSortColumn] });
-    }
-
-    mergeResourceWithReservation(reservation, params) {
-        if (params) {
-            Object.keys(params).map((key) => (
-                ['name', 'description'].indexOf(key) < 0 ? reservation[key] = params[key] : ''
-            ));
-        }
-        return reservation;
+        return true
     }
 
 
+    useEffect(() => {
+        init();
+    }, []);
 
-    /**
-     * Filter reservation based on cycle filter selected
-     * Here to search use Cycle.start time as Reservation Start time and Cycle.stop time as Reservation End time
-     */
-    async filterTableData(cycleValues) {
-        let filters = UtilService.localStore({ type: 'get', key: "reservation_list" });
-        _.remove(filters, function (filter) {
-            return filter.id === 'Cycle' || filter.id === 'CycleId' || filter.id === 'Start Time' || filter.id === 'End Time';
-        });
-        if (!cycleValues) {
-            UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters });
-            this.setState({ cycle: '', fStartTime: '', fEndTime: '' });
-            this.setTableProperty(filters, 'Filter');
-            await this.fetchTableData(null);
-        } else {
-            const filterCycleList = _.filter(this.cycleList, function (o) { return o.name === cycleValues });
-            if (filterCycleList) {
-                let cycle = filterCycleList[0];
-
-                this.setState({ fStartTime: new Date(cycle['start']), fEndTime: new Date(cycle['stop']) });
-                let cycleFilter = [{ 'id': 'Cycle', value: [cycle['start'], cycle['stop']] }];
-                cycleFilter.push({ 'id': 'CycleId', value: cycle['name'] });
-                cycleFilter.push({ 'id': 'Start Time', value: [cycle['start'], ''] });
-                cycleFilter.push({ 'id': 'End Time', value: ['', cycle['stop']] });
-                filters = [...cycleFilter, ...filters];
-                UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters });
-                this.setTableProperty(filters, 'Filter');
-                await this.fetchTableData(null);
-            }
-            this.setState({ cycle: cycleValues, });
-        }
-        this.pageUpdated = true;
-    }
-
-    /**
-    Reset the Reserved Start Datetime filter
-     */
-    async resetStartDateTime() {
-        this.setState({ 'fStartTime': '' });
-        let filters = UtilService.localStore({ type: 'get', key: "reservation_list" });
-        _.remove(filters, function (filter) {
-            let result = filter.id === 'Start Time';
-            return result;
-        });
-        UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters });
-        this.setTableProperty(filters, 'Filter');
-        await this.fetchTableData(null);
-    }
-
-    /**
-    Reset the Reserved End Datetime filter
-     */
-    async resetEndDateTime() {
-        this.setState({ 'fEndTime': '' });
-        let filters = UtilService.localStore({ type: 'get', key: "reservation_list" });
-        _.remove(filters, function (filter) {
-            let result = filter.id === 'End Time';
-            return result;
-        });
-        UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters });
-        this.setTableProperty(filters, 'Filter');
-        await this.fetchTableData(null);
+    const init = async () => {
+        await getFilterColumns();
+        await prepareLoading();
+        setIsLoading(false);
     }
 
-    /**
-        - To clear all filters above the table, it will be called from ViewTable-ClearAllFilter
-     */
-    clearAllFilter() {
-        this.setState({ cycle: '', fStartTime: '', fEndTime: '' });
-    }
 
-    /**
-     * Get View Table instance
-     * @param {*} instanceRef 
-     */
-    seTableInstanceRef(instanceRef) {
-        this.tableInstance = instanceRef;
-    }
+    const prepareLoading = async () => {
+        if (cycleList.length == 0) {
 
-    /**
-     * Set View table Properties from parent component
-     * @param {*} value - Value to set
-     * @param {*} propsType - Property type like to set the Filter, Columns Header
-     */
-    setTableProperty(value, propsType) {
-        if (this.tableInstance) {
-            if (propsType === 'Filter') {
-                this.tableInstance.state.filters = value;
-            }
+            let retrievedCycleList = await CycleService.getAllCycles();
+            retrievedCycleList?.forEach(cycle => {
+                cycle['url'] = cycle.name;
+                cycle['value'] = cycle.name;
+                cycle['stop_tick'] = moment(cycle.stop);
+                cycle['start_tick'] = moment(cycle.start);
+            });
+            setCycleList(retrievedCycleList);
         }
-    }
+        await setFromRedirection();
 
-    /**
-     * Set Filter: Start/End date and time. It will display the reservation which is active during the time frame
-     * @param {*} type - Date Filter Name
-     * @param {*} value - Date Value
-     */
-    async setDateRange(StartTime = this.state.fStartTime, EndTime = this.state.fEndTime) {
-        let filters = UtilService.localStore({ type: 'get', key: "reservation_list" });
-        _.remove(filters, function (filter) {
-            let result = filter.id === 'Start Time' || filter.id === 'End Time';
-            return result;
-        });
-        this.setState({ cycle: '' });
-        let reservedTimeFilter = [{ 'id': 'Start Time', value: [Validator.isEmpty(StartTime) ? '' : moment(new Date(StartTime)).format("YYYY-MM-DDTHH:mm:ss"), ''] }];
-        reservedTimeFilter.push({ 'id': 'End Time', value: ['', Validator.isEmpty(EndTime) ? '' : moment(new Date(EndTime)).format("YYYY-MM-DDTHH:mm:ss")] });
-        filters = [...reservedTimeFilter, ...filters];
-        this.setTableProperty(filters, 'Filter');
-        UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters });
-        await this.fetchTableData(null);
-        this.pageUpdated = true;
     }
 
     /**
      * Set selected rows form view table
      * @param {Row} selectedRows - rows selected in view table
      */
-    onRowSelection(selectedRows) {
-        this.pageUpdated = false;
-        this.selectedRows = selectedRows;
+    const onRowSelection = (selectedRows) => {
+        setPageUpdated(false);
+        setSelectedRows(selectedRows);
+        setPageUpdated(false);
     }
 
     /**
      * Callback function to close the dialog prompted.
      */
-    closeDialog() {
-        this.setState({ dialogVisible: false });
+    const closeDialog = () => {
+        setDialogVisible(false);
+
     }
 
-    closeList() {
-        this.props.history.length > 1 ? this.props.history.goBack() : this.props.history.push(`/su/timelineview/week`);
+    const closeList = () => {
+        props.history.length > 1 ? props.history.goBack() : props.history.push(`/su/timelineview/week`);
     }
 
     /**
      * Create confirmation dialog details
      */
-    confirmDeleteReservations() {
-        if (this.selectedRows.length === 0) {
+    const confirmDeleteReservations = () => {
+        if (selectedRows.length === 0) {
             appGrowl.show({ severity: 'info', summary: 'Select Row', detail: 'Select Reservation to delete.' });
         } else {
-            let dialog = {};
-            dialog.type = "confirmation";
-            dialog.header = "Confirm to Delete Reservation(s)";
-            dialog.detail = "Do you want to delete the selected Reservation(s)?";
-            dialog.content = this.getReservationDialogContent;
-            dialog.actions = [{ id: 'yes', title: 'Delete', callback: this.deleteReservations, className: 'act-btn-dispose' },
-            { id: 'no', title: 'Cancel', className: 'act-btn-cancel', callback: this.closeDialog }];
-            dialog.onSubmit = this.deleteReservations;
-            dialog.width = '55vw';
-            dialog.showIcon = false;
-            this.setState({ dialog: dialog, dialogVisible: true });
+            let xDialog = {};
+            xDialog.type = "confirmation";
+            xDialog.header = "Confirm to Delete Reservation(s)";
+            xDialog.detail = "Do you want to delete the selected Reservation(s)?";
+            xDialog.content = getReservationDialogContent;
+            xDialog.actions = [{ id: 'yes', title: 'Delete', callback: deleteReservations, className: 'act-btn-dispose' },
+            { id: 'no', title: 'Cancel', className: 'act-btn-cancel', callback: closeDialog }];
+            xDialog.onSubmit = deleteReservations;
+            xDialog.width = '55vw';
+            xDialog.showIcon = false;
+            setDialog(xDialog);
+            setDialogVisible(true);
         }
     }
 
     /**
     * Prepare Reservation(s) details to show on confirmation dialog
     */
-    getReservationDialogContent() {
-        return <DataTable value={this.selectedRows} resizableColumns columnResizeMode="expand" className="card" style={{ paddingLeft: '0em' }}>
+    const getReservationDialogContent = () => {
+        return <DataTable value={selectedRows} resizableColumns columnResizeMode="expand" className="card" style={{ paddingLeft: '0em' }}>
             <Column field="id" header="Reservation Id"></Column>
             <Column field="name" header="Name"></Column>
             <Column field="start_time" header="Start time"></Column>
             <Column field="stop_time" header="End Time"></Column>
         </DataTable>
-
     }
 
     /**
      * Delete selected Reservation(s)
      */
-    async deleteReservations() {
+    const deleteReservations = async () => {
         let hasError = false;
-        for (const reservation of this.selectedRows) {
+        for (const reservation of selectedRows) {
             if (!await ReservationService.deleteReservation(reservation.id)) {
                 hasError = true;
             }
         }
         if (hasError) {
             appGrowl.show({ severity: 'error', summary: 'error', detail: 'Error while deleting Reservation(s)' });
-            this.setState({ dialogVisible: false });
+            setDialogVisible(false);
         } else {
-            this.selectedRows = [];
-            this.setState({ dialogVisible: false });
-            this.componentDidMount();
+            setSelectedRows([])
+            setDialogVisible(false)
+            init(); 
             appGrowl.show({ severity: 'success', summary: 'Success', detail: 'Reservation(s) deleted successfully' });
         }
     }
 
-    /**
-     * Prepare API FIlter column to view table component
-     * @param {*} apiFilters 
-     * @param {*} columnDef 
-     * @returns 
-     */
-    getAPIFilter(apiFilters, columnDef) {
-        const defaultColKeys = Object.keys(columnDef);
-        defaultColKeys.forEach(key => {
-            let tmpColMap = {};
-            let tempKey = key;
-            tmpColMap['orgField'] = tempKey;
-            tmpColMap['tmpField'] = tempKey;
-            if (columnDef[key]) {
-                tmpColMap['displayName'] = columnDef[key]['name'];
-            }
-            this.columnMap.push(tmpColMap);
-            //Set Enable/Disable the Filter & SortBy in each column
-            if (apiFilters.data.filters[tempKey]) {
-                columnDef[key]['disableSortBy'] = !_.includes(apiFilters.data.ordering, tempKey);
-                columnDef[key]['disableFilters'] = false;
-                if ((tempKey !== 'start_time' && tempKey !== 'stop_time') && UIConstants.FILTER_MAP[apiFilters.data.filters[tempKey].type]) {
-                    columnDef[key]['filter'] = UIConstants.FILTER_MAP[apiFilters.data.filters[tempKey].type];
-                }
-            } else if (key === 'project_ids' && apiFilters.data.filters['projects_any']) {
-                columnDef[key]['disableSortBy'] = !_.includes(apiFilters.data.ordering, 'projects');
-                columnDef[key]['disableFilters'] = false;
-                columnDef[key]['filter'] = '';
-            } else if (key === 'stations' && apiFilters.data.filters['stations_any']) {
-                columnDef[key]['disableSortBy'] = false;
-                columnDef[key]['disableFilters'] = false;
-            } else if (key === 'duration' && apiFilters.data.filters['duration_min']) {
-                columnDef[key]['disableSortBy'] = !_.includes(apiFilters.data.ordering, 'duration_min');
-                columnDef[key]['disableFilters'] = false;
-            } else if (columnDef[key]['name']) {
-                columnDef[key]['disableSortBy'] = true;
-                columnDef[key]['disableFilters'] = true;
-            }
-        });
-        return columnDef;
-    }
-
-    /**
-     * Remove column in custom column order
-     * @param {array} arrayValue 
-     * @param {array} keys 
-     */
-    removeArrayIndex(arrayValue, keys) {
-        keys.forEach(key => {
-            let index = arrayValue.indexOf(key);
-            if (index !== -1) {
-                arrayValue.splice(index, 1);
-            }
-        });
-    }
-
-
-    setsyncWithCalendar = (value) => {
-        this.setState({ syncWithCalendar: value });
-
-    }
-    /**
-     * Remove column definition
-     * @param {column definition array} arrayValue 
-     * @param {array} keys 
-     */
-    removeColumns(arrayValue, keys) {
-        keys.forEach(key => {
-            delete arrayValue[key];
-        });
-    }
-    /**
-     * Get server side filter column details form API
-     */
-    async getFilterColumns() {
+    const getFilterColumns = async () => {
         const apiFilters = await ReservationService.getReservationFilterDefinition();
-        this.columnMap = [];
-        let tmpDefaulColumns = _.cloneDeep(this.state.defaultcolumns[0]);
-        let tmpOptionalColumns = _.cloneDeep(this.state.optionalcolumns[0]);
-        let tmpColumnOrders = _.cloneDeep(this.state.columnOrders);
-
         if (apiFilters) {
-            this.getDropDownOptionList(apiFilters);
-            tmpDefaulColumns = this.getAPIFilter(apiFilters, tmpDefaulColumns);
-            tmpOptionalColumns = this.getAPIFilter(apiFilters, tmpOptionalColumns);
-             this.setState({ tmpDefaulcolumns: [tmpDefaulColumns], tmpOptionalcolumns: [tmpOptionalColumns], tmpColumnOrders: tmpColumnOrders, columnMap: this.columnMap })
+            getDropDownOptionList(apiFilters);
+        }
+        const projects = await ProjectService.getProjectList(undefined, "name")
+        if (projects) {
+            for (const project of projects) project.value = project.name
+            setProjects(projects);
         }
     }
 
@@ -601,300 +199,122 @@ export class ReservationList extends Component {
      * Get Status list frol filter
      * @param {Array} suFilters 
      */
-    getDropDownOptionList(apiFilters) {
-        this.getOptions('reservation_type', apiFilters);
-        this.getOptions('subject', apiFilters);
-        this.stationList = [];
-        this.getOptions('stations_any', apiFilters);
-        this.getOptions('projects',apiFilters);
-
-
+    const getDropDownOptionList = (apiFilters) => {
+        getOptions('reservation_type', apiFilters);
+        setSubjectsOptionList(getOptions('subject', apiFilters));
+        setStationList(getOptions('stations_any', apiFilters));
     }
 
-    getOptions(key, apiFilter) {
-        console.log("apifilter " + key,apiFilter)
+    const getOptions = (key, apiFilter) => {
+        let valueList = []
         if (apiFilter.data.filters[key]) {
             apiFilter.data.filters[key].choices?.forEach(choice => {
-                if (key === 'subject') {
-                    this.subjectsOptionList.push(choice.value);
-                } else if (key === 'reservation_type') {
-                    this.reservationTypeOptionList.push(choice.value);
-                } else if (key === 'stations_any') {
-                    this.stationList.push({ name: choice.display_name, value: choice.value });
-                } else if (key === 'projects') {
-                    this.projects.push({ name: choice.display_name, value: choice.value });
+                let value = choice.value;
+                switch (key) {
+                    case 'subject':
+                    case 'reservation_type':
+                        valueList.push(value);
+                        break;
+                    case 'stations_any':
+                    case 'projects':
+                        valueList.push({ name: choice.display_name, value: value })
+                        break;
                 }
-                
             })
         }
-
+        if (key == 'stations_any') valueList = _.orderBy(valueList, ['name'], ['asc']);
+        return valueList;
     }
 
     /**
-     * Fetch data from server side - while doing pagination, filtering, sorting
-     * @param {Table State} Table props state 
-     * @returns 
-     */
-    async fetchTableData(state) {
-
-        this.filterQry = '';
-        this.orderBy = '';
-        this.pageUpdated = true;
-        this.setState({ loadingStatus: true });
-        let filters = UtilService.localStore({ type: 'get', key: "reservation_list" });
-        const sortByValue = UtilService.localStore({ type: 'get', key: "ReservationListSortData" });
-        if (filters.length > 0) {
-            for (const filter of filters) {
-                if (filter.id === 'Start Time') {
-                    const values = filter.value;
-                    if (values[0] && values[0] !== '') {
-                        this.filterQry += 'start_time_after=' + moment(new Date(values[0])).format("YYYY-MM-DD HH:mm:ss&");
-                    }
-                    if (values[1] && values[1] !== '') {
-                        this.filterQry += 'start_time_before=' + moment(new Date(values[1])).format("YYYY-MM-DD HH:mm:ss&");
-                    }
-                } else if (filter.id === 'End Time') {
-                    const values = filter.value;
-                    if (values[0] && values[0] !== '') {
-                        this.filterQry += 'stop_time_after=' + moment(new Date(values[0])).format("YYYY-MM-DD 00:00:00&");
-                    }
-                    if (values[1] && values[1] !== '') {
-                        this.filterQry += 'stop_time_before=' + moment(new Date(values[1])).format("YYYY-MM-DD 23:59:59&");
-                    }
-                } else if (filter.id === 'Projects') {
-                    if (filter.value.length > 0) {
-                        const values = _.split(filter.value, ",");
-                        for (const value of values) {
-                            this.filterQry += 'projects=' + encodeURIComponent(value) + '&';
-                        }
-                    }
-
-                } else if (filter.id === 'Stations') {
-                    const stationFilterType = _.find(filters, { id: 'stationFilterType' });
-                    if (filter.value.length > 0) {
-                        const values = _.split(filter.value, ",");
-                        for (const value of values) {
-                            if (stationFilterType && stationFilterType.value === 'All') {
-                                this.filterQry += 'stations_all=' + value + "&";
-                            } else {
-                                this.filterQry += 'stations_any=' + value + "&";
-                            }
-                        }
-                    }
-                } else if (filter.id === 'Duration (Days HH:mm:ss)' && filter.value !== '') {
-                    let columnDetails = _.find(this.state.columnMap, { displayName: filter.id });
-                    const values = _.split(filter.value, ",");
-                    if ((values.length === 0) || (values[0] === '' || values[0] === '0') && (values[1] === '' || values[1] === '0')) {
-                        this.filterQry += "duration_isnull=false&";
-                    } else {
-                        if (values[0].includes(":")) {
-                            this.filterQry += columnDetails.orgField + "_min" + '=' + UnitConverter.getDDDHHmmssToSecs(values[0]) + '&';
-                        }
-                        if (values[1].includes(":")) {
-                            this.filterQry += columnDetails.orgField + "_max" + '=' + UnitConverter.getDDDHHmmssToSecs(values[1]) + '&';
-                        }
-                    }
-                } else if (filter.id === 'durationNull') {
-                    this.filterQry += "duration_isnull=" + filter.value + '&';
-                } else {
-                    let columnDetails = _.find(this.state.columnMap, { displayName: filter.id });
-                    if (columnDetails) {
-                        this.filterQry += columnDetails.orgField + '=' + encodeURIComponent(filter.value) + '&'
-                    }
-                }
-            }
-        }
-
-        let sortBy = state?.sortBy ? state.sortBy[0] : (sortByValue) ? sortByValue : null;
-        if (sortBy) {
-            this.defaultSortColumn = sortBy;
-            UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: sortBy });
-            let columnDetails = _.find(this.state.columnMap, { displayName: sortBy.id });
-            if (columnDetails) {
-                this.orderBy = 'ordering=' + ((sortBy.desc) ? '-' : '') + columnDetails.orgField;
-            }
-        }
-        this.filterQry = this.filterQry.substring(0, this.filterQry.length - 1);
-
-        this.currentPageSize = (state?.pageSize) ? state.pageSize : this.currentPageSize;
-        let offset = (state?.pageIndex) ? state.pageIndex * this.currentPageSize : 0;
-        
-        await this.getReservationList(this.filterQry, this.orderBy, this.currentPageSize, offset);
-
+    * Fetch data from server side - while doing pagination, filtering, sorting
+    * @param {Table State} Table props state 
+    * @returns 
+    */
+    const fetchTableData = async (tablestate = tableState) => {
+        setPageUpdated(true);
+        setLoadingStatus(true);
+        setTableState(tablestate)
+        console.log("state",tablestate);
+        let { filterQry, newOrderBy } = prepareQuery(tablestate);
+        filterQry = getCycleFilter(tablestate, filterQry);
         
-        return [this.state.reservationsList, this.totalPage];
+        await getReservationList(filterQry, newOrderBy, tablestate?.rows || 15, tablestate?.first || 0);
+        setLoadingStatus(false);
+        return [reservationsList, totalPage];
     }
 
+
+
     /**
      * Get reservation list
      */
-    async getReservationList(filterQry, orderBy, limit, offset) {
+    const getReservationList = async (filterQry, orderBy, limit, offset) => {
         const promises = [
             ReservationService.getReservationsWithFilter(filterQry, orderBy, limit, offset),
         ];
         const permission = await AuthUtil.getUserRolePermission();
-        this.setState({ userrole: permission });
-
-        this.reservations = [];
+        setUserrole(permission);
+        let xReservations = [];
         Promise.all(promises).then(async responses => {
-            this.totalPage = responses?.[0]?.data ? responses[0].data.count : 0;
+            setTotalPage(responses?.[0]?.data ? responses[0].data.count : 0);
             if (responses?.[0]?.data?.results) {
                 for (const response of responses[0].data.results) {
-                    let reservation = this.updateReservation(response, response);
-                    this.reservations.push(reservation);
+                    let reservation = updateReservation(response, response, cycleList);
+                    xReservations.push(reservation);
                 }
             }
-            this.cycleList?.forEach(cycle => {
-                cycle['url'] = cycle.name;
-            });
-            this.pageUpdated = true;
-            this.setState({
-                isLoading: false,
-                reservationsList: this.reservations,
-                cycleList: this.cycleList
-            });
+            setReservationsList(xReservations);
+            setPageUpdated(true);
         });
     }
 
-    updateReservation(reservation, response) {
-        reservation = this.mergeResourceWithReservation(reservation, response.specifications_doc.activity);
-        reservation = this.mergeResourceWithReservation(reservation, response.specifications_doc.effects);
-        reservation = this.mergeResourceWithReservation(reservation, response.specifications_doc.schedulability);
-        reservation['reservation_type'] = reservation.type;
-        
-        if (reservation.projects_ids) {
-            reservation['projects'] = reservation.projects_ids.join(', ');
-        } else {
-            reservation['projects'] = '';
-        }
-
-
-
-        if (response.specifications_doc.resources.stations) {
-            reservation['stations'] = response.specifications_doc.resources.stations.join(', ');
-        } else {
-            reservation['stations'] = '';
-        }
-        if (reservation.duration === null || reservation.duration === '') {
-            reservation.duration = 'Unknown';
-            reservation['stop_time'] = 'Unknown';
-        } else {
-            reservation.duration = UnitConverter.getSecsToDDHHmmss(reservation.duration);
-            reservation['stop_time'] = moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
-        }
-        reservation['start_time'] = moment(reservation['start_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
-        reservation['actionpath'] = `/reservation/view/${reservation.id}`;
-        reservation['canSelect'] = true;
-        return reservation;
-    }
 
     /**
      * Get Option-list values for Select Dropdown filter in 'Viewtable'
      * @param {String} id : Column id
      * @returns 
      */
-    getFilterOptions(id) {
-        let options = null;
-        if (id && id === 'Reservation Type') {
-            options = this.reservationTypeOptionList;
-        } else if (id && id === 'Subject') {
-            options = this.subjectsOptionList;
-        } else if (id && id === 'Projects') {
-            options = this.projects;
-        } 
-        else if (id === 'Stations') {
-            this.stationList = _.orderBy(this.stationList, ['name'], ['asc']);
-            return this.stationList;
+    const getFilterOptions = (id) => {
+        if (!id) return null;
+        switch (id) {
+            case 'Reservation Type':
+                return reservationTypeOptionList;
+            case 'Subject':
+                return subjectsOptionList;
+            case 'Projects':
+                return projects;
+            case 'Cycle':
+                return cycleList;
+            case 'Stations':
+                return stationList;
+            default:
+                return null;
         }
-        return options;
     }
 
-
-    /**
-     * Function to call wnen websocket is connected
-     */
-    onConnect() {
-        try {
-            const userDets = localStorage.getItem("user");
-            if (userDets) {
-                this.websocket.sendMessage(JSON.stringify({ "token": JSON.parse(userDets).websocket_token }));
-            }
-        } catch (err) {
-            console.log('err', err)
-        }
-    }
-
-
-
     /**
-     * Handles the message received through websocket
-     * @param {String} data - String of JSON data
-     */
-    handleData(data) {
-        if (data) {
-            const jsonData = JSON.parse(data);
-            this.refreshReservationList(jsonData);
-        }
-    }
-
-    /**
-     * Refresh the Reservation list
-     * @param {*} jsonData 
-     */
-    async refreshReservationList(jsonData) {
-        switch (jsonData.object_type) {
-            case 'reservation': {
-                let reservationList = this.state.reservationsList;
-                if (jsonData.action === 'delete') {
-                    const count = reservationList.length;
-                    _.remove(reservationList, function (reservation) { return reservation.id === jsonData.object_details.id });
-                    if (count > reservationList.length) {
-                        this.totalPage--;
-                    }
-                } else {
-                    ReservationService.getReservationsWithFilter(('id=' + jsonData.object_details.id + '&' + this.filterQry), this.orderBy, this.currentPageSize, this.offset).then(async (updatedReservation) => {
-                        if (updatedReservation && updatedReservation.data.count > 0) {
-                            let tmpRes = updatedReservation.data.results[0];
-                            tmpRes = await this.updateReservation(tmpRes, _.cloneDeep(tmpRes));
-                            if (tmpRes) {
-                                if (jsonData.action === 'create') {
-                                    reservationList.push(tmpRes);
-                                    this.totalPage++;
-                                } else if (jsonData.action === 'update') {
-                                    _.remove(reservationList, function (reservation) { return reservation.id === tmpRes.id });
-                                    reservationList.push(tmpRes);
-                                }
-                            }
-                        } else {
-                            const count = reservationList.length;
-                            _.remove(reservationList, function (reservation) { return reservation.id === jsonData.object_details.id });
-                            if (count > reservationList.length) {
-                                this.totalPage--;
-                            }
-                        }
-                        this.setState({ reservationsList: reservationList });
-                    });
-                }
-
-                break;
-            }
-            default: { break; }
+         * Refresh the Reservation list
+         * @param {*} jsonData 
+         */
+    const refreshReservationList = (jsonData) => {
+        if (jsonData.object_type == "reservation") { /* somebody else did a update on a reservation . so let's handle that in the most simple way */
+            fetchTableData(tableState);
         }
     }
+    useParsedDataWebSocket(refreshReservationList)
 
-    movetoCreate = () => {
-        this.props.history.push(`/reservation/create`);
+    const movetoCreate = () => {
+        props.history.push(`/reservation/create`);
     }
 
-    render() {
+    const render = () => {
 
-        const permissions = this.state.userrole.userRolePermission.reservation;
+        const permissions = userrole.userRolePermission.reservation;
         return (
             <React.Fragment>
-                <PageHeader location={this.props.location} title={'Reservation - List'} className="defaultrightpageHeader"
+                <PageHeader location={props.location} title={'Reservation - List'} className="defaultrightpageHeader"
                     actions={[
-
-
                         {
                             icon: 'pi-plus',
                             title: permissions?.create ? 'Add Reservation' : "Don't have permission to add new Reservation",
@@ -902,113 +322,73 @@ export class ReservationList extends Component {
                             type: 'buttonv2',
                             actOn: 'click',
                             props: {
-                                callback: this.movetoCreate
+                                callback: movetoCreate
 
                             }
                         },
-                        { icon: 'pi-trash', title: 'Delete selected Reservations', disabled: permissions?.delete ? !permissions?.delete : true, type: 'buttonv2', actOn: 'click', props: { callback: this.confirmDeleteReservations } },
-
-                        { icon: 'pi-times', title: 'Click to close Reservation list', type: 'buttonv2', actOn: 'click', props: { callback: this.closeList } }
-
-
-
-
+                        { icon: 'pi-trash', title: 'Delete selected Reservations', disabled: permissions?.delete ? !permissions?.delete : true, type: 'buttonv2', actOn: 'click', props: { callback: confirmDeleteReservations } },
 
+                        { icon: 'pi-times', title: 'Click to close Reservation list', type: 'buttonv2', actOn: 'click', props: { callback: closeList } }
+                    ]} />
+                {isLoading ? <AppLoader /> : (permissions?.list) ?
+
+                    <div style={{ height: "calc(100vh - 10.1em)", overflow: "hidden" }}>
+
+                        <ViewTableExt
+                            lazy={true}
+                            data={reservationsList}
+                            defaultcolumns={defaultColumns}
+                            optionalcolumns={optionalColumns}
+                            columnclassname={columnclassname}
+                            columnOrders={columnOrders}
+                            defaultSortColumn={defaultSortColumn}
+                            showaction={true}
+                            paths={paths}
+                            tablename={tablename}
+                            showCSV={true}
+                            allowRowSelection={true}
+                            onRowSelection={onRowSelection}
+                            lsKeySortColumn={lsKeySortColumn}
+                            loading={loadingStatus || isLoading}
+                            pageUpdated={pageUpdated}
+                            storeFilter={true}
+                            callBackFunction={fetchTableData}
+                            showFilterOption={getFilterOptions}
+                            totalPage={totalPage}
+                            totalRecords={totalPage}
+                        >
+                        </ViewTableExt>
+                    </div> : <AccessDenied />}
+                <CustomDialog type="confirmation" visible={dialogVisible}
+                    header={dialog.header} message={dialog.detail} actions={dialog.actions}
+                    content={dialog.content} width={dialog.width} showIcon={dialog.showIcon}
+                    onClose={closeDialog} onCancel={closeDialog} onSubmit={dialog.onSubmit} />
+            </React.Fragment>
+        );
 
 
+    };
+    return render();
 
-                    ]} />
-                {this.state.isLoading ? <AppLoader /> : (this.state.reservationsList) ?
-                    <>
-                        {permissions?.list ?
-                            <>
-
-                                <Panel className="FilterPanel" header="Special Filters" >
-                                    <div className='divbox'>
-                                        <label htmlFor="cycle" >Filter by Cycle</label>
-                                        <Dropdown data-testid="cycle" id="cycle" optionLabel="name" optionValue="url" 
-                                            value={this.state.cycle}
-                                            options={this.state.cycleList}
-                                            onChange={(e) => { this.filterTableData(e.value) }}
-                                            className="ms-width reservationcycledropper"
-                                            filter={true}
-                                            showClear={true}
-                                            showFilterClear={true}
-                                            tooltip="Select cycle to view reservations that start and end in the cycle (will not include those are reserved for unknown duration)"
-                                        />
-                                    </div>
-                                    <div className='divbox'>
-                                        <label htmlFor="fstartdate" >Reserved From</label>
-                                        <Calendar id="fstartdate" showIcon
-                                            showTime
-                                            dateFormat="yy-mm-dd"
-                                            hourFormat="24"
-
-                                            value={this.state.fStartTime}
-                                            onChange={(e) => this.setState({ fStartTime: e.value })}
-                                        />
-                                        <Button onClick={this.resetStartDateTime} title="Clear date range" >  <i className="pi pi-times"  ></i>   </Button>
-                                    </div>
-                                    <div className='divbox'>
-                                        <label htmlFor="fenddate" >Reserved To</label>
-                                        <Calendar id="fenddate" showIcon
-
-                                            showTime
-                                            dateFormat="yy-mm-dd"
-                                            hourFormat="24"
-                                            value={this.state.fEndTime}
-                                            onChange={(e) => this.setState({ fEndTime: e.value })}
-                                        />
-                                        <Button onClick={this.resetEndDateTime} title="Clear date range"> <i className="pi pi-times"  ></i>  </Button>
-                                    </div>
-                                </Panel>
-
-
-
-
-                                <ViewTable
-                                    data={this.state.reservationsList}
-                                    defaultcolumns={this.state.tmpDefaulcolumns ? this.state.tmpDefaulcolumns : this.state.defaultcolumns}
-                                    optionalcolumns={this.state.tmpOptionalcolumns ? this.state.tmpOptionalcolumns : this.state.optionalcolumns}
-                                    columnclassname={this.state.columnclassname}
-                                    columnOrders={this.state.columnOrders}
-                                    defaultSortColumn={this.defaultSortColumn}
-                                    showaction={true}
-                                    paths={this.state.paths}
-                                    tablename="reservation_list"
-                                    showCSV={true}
-                                    allowRowSelection={true}
-                                    onRowSelection={this.onRowSelection}
-                                    toggleBySorting={(sortData) => this.toggleBySorting(sortData)}
-                                    lsKeySortColumn={this.lsKeySortColumn}
-                                    pageUpdated={this.pageUpdated}
-                                    storeFilter={true}
-                                    callBackFunction={this.fetchTableData}
-                                    showFilterOption={this.getFilterOptions}
-                                    totalPage={this.totalPage}
-                                    clearAllFuncCallback={this.clearAllFilter} // Callback function will call when the clearAllFilter called in ViewTable
-                                    tableInstanceRef={this.seTableInstanceRef}
-                                />
-
-                            </> : <AccessDenied />}
-                    </>
-                    : <div>No Reservation found </div>
+    function getCycleFilter(tablestate, filterQry) {
+        if (tablestate.filters.cycle.value) {
+            for (const cycle of cycleList) {
+                if (cycle.name == tablestate.filters.cycle.value) {
+                    filterQry = AddDateRangeQuery(filterQry, { key: "start_time", value: [cycle.start_tick, cycle.stop_tick] });
+                    filterQry = AddDateRangeQuery(filterQry, { key: "stop_time", value: [cycle.start_tick, cycle.stop_tick] });
                 }
-
-                <CustomDialog type="confirmation" visible={this.state.dialogVisible}
-                    header={this.state.dialog.header} message={this.state.dialog.detail} actions={this.state.dialog.actions}
-                    content={this.state.dialog.content} width={this.state.dialog.width} showIcon={this.state.dialog.showIcon}
-                    onClose={this.closeDialog} onCancel={this.closeDialog} onSubmit={this.state.dialog.onSubmit} />
-                {!this.state.isLoading &&
-                    <Websocket ref={websocket => this.websocket = websocket} url={process.env.REACT_APP_WEBSOCKET_URL}
-                        onOpen={this.onConnect} onMessage={this.handleData} />}
-            </React.Fragment>
-        );
+            }
+        }
+        return filterQry;
     }
 }
 
+
+
 ReservationList.propTypes = {
     match: PropTypes.object,
-  history: PropTypes.object,
-  location: PropTypes.oneOfType([PropTypes.object, PropTypes.string])
+    history: PropTypes.object,
+    location: PropTypes.oneOfType([PropTypes.object, PropTypes.string])
 }
+
+
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 0058723ae745d6c1427d696e4218fbd495b39551..a7894301e861c10b67c9298d1beaba6129e0203d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -24,6 +24,7 @@ import { useParsedDataWebSocket } from '../../utils/websocket';
 
 const derviedscheduleconstraints = {};
 
+
 const getUIAttr = (props) => {
     let uistore = UtilService.localStore({
         type: 'get',
@@ -781,9 +782,8 @@ export function SchedulingUnitList(props) {
             }
             console.log("filterQry", filterQry, "orderby", newOrderBy)
         }
-        setIsLoading(false)
-
         await getSchedulingUnitList(false, suType, filterQry, newOrderBy, tablestate?.rows || 15, tablestate?.first || 0);
+        setIsLoading(false)
         return [scheduleunit, totalPage];
     }
 
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
index e2e4a085d292e40f1af4551f51436c4a33f63548..22e892326fe02c1c91e4c3044915d58015cde76e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
@@ -764,10 +764,10 @@ export class SchedulingSetCreate extends Component {
                     }
                     schema.definitions = { ...schema.definitions, ...taskTemplate.ref_resolved_schema.definitions };
                     taskPaths.reverse();
-                    console.log("$strategyRefs", $strategyRefs )
-                    console.log("taskPaths", taskPaths )
-                    console.log("taskTemplate", taskTemplate )
-                    console.log("taskFilters", this.taskFilters )
+                    //console.log("$strategyRefs", $strategyRefs )
+                    //console.log("taskPaths", taskPaths )
+                    //console.log("taskTemplate", taskTemplate )
+                    //console.log("taskFilters", this.taskFilters )
 
                     const paramProp = await ParserUtility.getParamProperty($strategyRefs, taskPaths, taskTemplate.ref_resolved_schema, this.taskFilters);
                     schema.properties[param.name] = { ...paramProp};
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.list.js
index 73862b2cdd597b7b1f6cda711e385dcf70afc3df..a5dfe4e012f097714861c75d44ef8e6cc7d5d2d7 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.list.js
@@ -14,7 +14,7 @@ import AuthStore from '../../authenticate/auth.store';
 import AuthUtil from '../../utils/auth.util';
 import AccessDenied from '../../layout/components/AccessDenied';
 import {SystemEventColumns}  from './Business/system.event.columns';
-import { GetBaseQueries } from '../../components/ViewTable/ViewTableExtBusiness';
+import {  prepareQuery } from '../../components/ViewTable/ViewTableExtBusiness';
 
 export function SystemEventList (props) {
     
@@ -240,33 +240,11 @@ export function SystemEventList (props) {
      */
     const fetchTableData = async (tablestate) => {
         setTableState(tablestate)
-        let newOrderBy = ""
-        let filterQry = ""
         setPageUpdated(true);
         setLoadingStatus(true);
-        if (tablestate.filters) {
-            let filters = Object.entries(tablestate.filters)
-            if (filters.length > 0) {
-                for (const keyvaluefilter of filters) {
-                    let filter = keyvaluefilter[1]
-                    if (filter.value == null || filter.value == "") continue;
-                    let isHandled = false;
-                    ({ filterQry, isHandled } = GetBaseQueries(filter, filterQry, isHandled));
-                    if (!isHandled) {
-                        console.log("filter" + filter.key + " is not handled");
-                       }
-                }
-            }
-
-            if (tablestate.sortField) {
-                let sortColumn = tablestate.filters?.[tablestate.sortField]?.column
-                let sortfield =  sortColumn?.querykey ||  tablestate.sortField
-                newOrderBy = 'ordering=' + ((tablestate.sortOrder == 1) ? '-' : '') + sortfield
-            }
-        }
-
-        setIsLoading(false)
+        let { filterQry, newOrderBy } = prepareQuery(tablestate);
         await getSystemEventList(filterQry, newOrderBy, tablestate?.rows || 15, tablestate?.first || 0);
+        setIsLoading(false)
         return [systemEvents, totalPage];
     }
 
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.listlite.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.listlite.js
index bb5dec014992f2b38bc8de1f7714d0ce6f9608b5..10edce0cd7a77777054673bb391a933097e00f87 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.listlite.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.listlite.js
@@ -128,9 +128,9 @@ export class SystemEventListLite extends Component {
                 for (const response of responses[1].data.results) {
                     systemEvent = response;
                     if (response.affected_hardware_doc.stations) {
-                        systemEvent['affected_hardware_doc_stations_all'] = response.affected_hardware_doc.stations.join(', ');
+                        systemEvent['affected_hardware_doc_stations'] = response.affected_hardware_doc.stations.join(', ');
                     } else {
-                        systemEvent['affected_hardware_doc_stations_all'] = '';
+                        systemEvent['affected_hardware_doc_stations'] = '';
                     }
                     systemEvent['duration'] = systemEvent.stop ? UnitConverter.getSecsToDDHHmmss(moment(systemEvent.stop).diff(moment(systemEvent.start), 'seconds')) : 'Unknown';
                     if (systemEvent.stop === null || systemEvent.stop === '') {
@@ -142,7 +142,6 @@ export class SystemEventListLite extends Component {
                     systemEvent['start'] = moment(systemEvent['start']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
                     systemEvent['tmp_affected_tasks_ids'] = systemEvent.affected_tasks_ids;
                     systemEvent['id_link'] = this.getSystemEventLinksList(systemEvent.id);
-                    systemEvent['id'] = systemEvent.id;
                     systemEvent['affected_tasks_ids'] = this.getLinksList(systemEvent.affected_tasks_ids);
                     const template = _.find(this.seAffectedHardwareTemplateList, { id: systemEvent.affected_hardware_template_id });
                     systemEvent['affected_hardware_template_name'] = (template) ? _.startCase(template.name) : '';
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/__snapshots__/view.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/__snapshots__/view.test.js.snap
deleted file mode 100644
index d1efef6265d2336da5b9f02afa6f287768bd32e2..0000000000000000000000000000000000000000
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/__snapshots__/view.test.js.snap
+++ /dev/null
@@ -1,3884 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Jeditor Checking Correctness of Custom fields in JEditor using Simple Observation draft: Checking Correctness of Custom fields in JEditor using Simple Observation draft 1`] = `
-<DocumentFragment>
-  <div
-    class="page-header defaultpageHeader"
-  >
-    <div
-      class="title"
-    >
-      <h2
-        class="page-title"
-      >
-        Task - Details
-      </h2>
-    </div>
-    <div
-      class="page-action-menu page-actionsdefaultpageHeader"
-    >
-      <button
-        class="p-button p-component p-button-icon-only"
-        data-pc-name="button"
-        data-pc-section="root"
-        title="Click to Edit Task"
-      >
-        <span
-          class="p-button-icon p-c pi fas fa-edit"
-          data-pc-section="icon"
-        />
-        <span
-          class="p-button-label p-c"
-          data-pc-section="label"
-        >
-           
-        </span>
-      </button>
-      <button
-        class="p-button p-component p-button-icon-only"
-        data-pc-name="button"
-        data-pc-section="root"
-        title="Delete Task"
-      >
-        <span
-          class="p-button-icon p-c pi fas fa-trash"
-          data-pc-section="icon"
-        />
-        <span
-          class="p-button-label p-c"
-          data-pc-section="label"
-        >
-           
-        </span>
-      </button>
-      <button
-        class="p-button p-component p-button-icon-only"
-        data-pc-name="button"
-        data-pc-section="root"
-        title="Click to Close Task"
-      >
-        <span
-          class="p-button-icon p-c pi pi-times"
-          data-pc-section="icon"
-        />
-        <span
-          class="p-button-label p-c"
-          data-pc-section="label"
-        >
-           
-        </span>
-      </button>
-    </div>
-  </div>
-  <div
-    class="main-content"
-  >
-    <div
-      class="p-grid"
-    >
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Name
-      </label>
-      <span
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        Observation
-      </span>
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Description
-      </label>
-      <span
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        A simple short test observation
-      </span>
-    </div>
-    <div
-      class="p-grid"
-    >
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Created At
-      </label>
-      <span
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        2022-06-17 05:53:55
-      </span>
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Updated At
-      </label>
-      <span
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        2022-06-17 05:53:55
-      </span>
-    </div>
-    <div
-      class="p-grid"
-    >
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Scheduling Unit
-      </label>
-      <a
-        class="col-lg-4 col-md-4 col-sm-12"
-        href="/schedulingunit/view/draft/1"
-      >
-        IM LBA LoDSS - 5 Beams
-      </a>
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Short Description
-      </label>
-      <span
-        class="col-lg-4 col-md-4 col-sm-12"
-      />
-    </div>
-    <div
-      class="p-grid"
-    >
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Predecessors
-      </label>
-      <div
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        <ul
-          class="task-list"
-        />
-      </div>
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Successors
-      </label>
-      <div
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        <ul
-          class="task-list"
-        />
-      </div>
-    </div>
-    <div
-      class="p-grid"
-    >
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Template
-      </label>
-      <span
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        target observation
-      </span>
-      <label
-        class="col-lg-2 col-md-2 col-sm-12"
-      >
-        Blueprints
-      </label>
-      <div
-        class="col-lg-4 col-md-4 col-sm-12"
-      >
-        <ul
-          class="task-list"
-        />
-      </div>
-    </div>
-    <div
-      class="p-fluid"
-    >
-      <div
-        class="p-grid"
-      >
-        <div
-          class="p-col-12"
-          style="width: 100%;"
-        >
-          <div
-            class="jsonspeceditor"
-          >
-            <div
-              id="editor_holder_loader"
-            />
-            <div
-              class="je-ready"
-              data-theme="html"
-              id="editor_holder"
-            >
-              <div
-                class="je-object__container"
-                data-schemaid="specification"
-                data-schemapath="specification"
-              >
-                <span
-                  class="je-header je-object__title"
-                >
-                  <button
-                    class="json-editor-btn-collapse json-editor-btntype-toggle"
-                    title="Collapse"
-                    type="button"
-                  >
-                    <i
-                      class="fas fa-caret-down"
-                    />
-                  </button>
-                  <span>
-                     Task Specification
-                  </span>
-                </span>
-                <span
-                  class="je-object__controls"
-                >
-                  <div
-                    class="je-modal"
-                    style="display: none;"
-                  >
-                    <label
-                      for="specification-edit-json-textarea"
-                      style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                    >
-                      Edit JSON
-                    </label>
-                    <textarea
-                      aria-labelledby="specification-edit-json-textarea"
-                      class="je-textarea je-edit-json--textarea"
-                      id="specification-edit-json-textarea"
-                    />
-                    <button
-                      class="json-editor-btn-save json-editor-btntype-save"
-                      title="Save"
-                      type="button"
-                    >
-                      <i
-                        class="fas fa-save"
-                      />
-                    </button>
-                    <button
-                      class="json-editor-btn-copy json-editor-btntype-copy"
-                      title="Copy"
-                      type="button"
-                    >
-                      <i
-                        class="fas fa-copy"
-                      />
-                    </button>
-                    <button
-                      class="json-editor-btn-cancel json-editor-btntype-cancel"
-                      title="Cancel"
-                      type="button"
-                    >
-                      <i
-                        class="fas fa-ban"
-                      />
-                    </button>
-                  </div>
-                  <div
-                    class="je-modal"
-                    style="display: none;"
-                  >
-                    <div
-                      class="property-selector"
-                    />
-                    <label
-                      for="specification-property-selector"
-                      style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                    >
-                      Properties
-                    </label>
-                    <input
-                      aria-labelledby="specification-property-selector"
-                      class="property-selector-input"
-                      id="specification-property-selector"
-                      placeholder="Property name..."
-                      type="text"
-                    />
-                    <button
-                      class="json-editor-btn-add json-editor-btntype-add"
-                      title="Add"
-                      type="button"
-                    >
-                      <i
-                        class="fas fa-plus"
-                      />
-                    </button>
-                    <div
-                      style="clear: both;"
-                    />
-                  </div>
-                  <button
-                    class="json-editor-btn-edit json-editor-btntype-editjson"
-                    disabled=""
-                    style="display: none;"
-                    title="Edit JSON"
-                    type="button"
-                  >
-                    <i
-                      class="fas fa-pen"
-                    />
-                  </button>
-                  <button
-                    class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                    disabled=""
-                    style="display: none;"
-                    title="Object Properties"
-                    type="button"
-                  >
-                    <i
-                      class="fas fa-list"
-                    />
-                  </button>
-                </span>
-                <div
-                  style="display: none;"
-                />
-                <div
-                  class="je-indented-panel"
-                >
-                  <div>
-                    <div>
-                      <div
-                        class="row"
-                      >
-                        <div
-                          class="je-object__container"
-                          data-schemapath="specification.correlator"
-                        >
-                          <span
-                            class="je-header je-object__title"
-                          >
-                            <button
-                              class="json-editor-btn-collapse json-editor-btntype-toggle"
-                              title="Collapse"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-caret-down"
-                              />
-                            </button>
-                            <span>
-                              correlator
-                            </span>
-                          </span>
-                          <span
-                            class="je-object__controls"
-                          >
-                            <div
-                              class="je-modal"
-                              style="display: none;"
-                            >
-                              <label
-                                for="specification.correlator-edit-json-textarea"
-                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                              >
-                                Edit JSON
-                              </label>
-                              <textarea
-                                aria-labelledby="specification.correlator-edit-json-textarea"
-                                class="je-textarea je-edit-json--textarea"
-                                id="specification.correlator-edit-json-textarea"
-                              />
-                              <button
-                                class="json-editor-btn-save json-editor-btntype-save"
-                                title="Save"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-save"
-                                />
-                              </button>
-                              <button
-                                class="json-editor-btn-copy json-editor-btntype-copy"
-                                title="Copy"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-copy"
-                                />
-                              </button>
-                              <button
-                                class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                title="Cancel"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-ban"
-                                />
-                              </button>
-                            </div>
-                            <div
-                              class="je-modal"
-                              style="display: none;"
-                            >
-                              <div
-                                class="property-selector"
-                              />
-                              <label
-                                for="specification.correlator-property-selector"
-                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                              >
-                                Properties
-                              </label>
-                              <input
-                                aria-labelledby="specification.correlator-property-selector"
-                                class="property-selector-input"
-                                id="specification.correlator-property-selector"
-                                placeholder="Property name..."
-                                type="text"
-                              />
-                              <button
-                                class="json-editor-btn-add json-editor-btntype-add"
-                                title="Add"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-plus"
-                                />
-                              </button>
-                              <div
-                                style="clear: both;"
-                              />
-                            </div>
-                            <button
-                              class="json-editor-btn-edit json-editor-btntype-editjson"
-                              disabled=""
-                              style="display: none;"
-                              title="Edit JSON"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-pen"
-                              />
-                            </button>
-                            <button
-                              class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                              disabled=""
-                              style="display: none;"
-                              title="Object Properties"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-list"
-                              />
-                            </button>
-                          </span>
-                          <div
-                            style="display: none;"
-                          />
-                          <div
-                            class="je-indented-panel"
-                          >
-                            <div>
-                              <div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.correlator.integration_time"
-                                    data-schematype="number"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="je-form-input-label"
-                                        for="specification[correlator][integration_time]"
-                                      >
-                                        Integration time
-                                      </label>
-                                      <input
-                                        aria-describedby="specification[correlator][integration_time]-description"
-                                        disabled=""
-                                        id="specification[correlator][integration_time]"
-                                        min="0.1"
-                                        name="specification[correlator][integration_time]"
-                                        type="text"
-                                      />
-                                      <div />
-                                      <p
-                                        class="je-form-input-label"
-                                        id="specification[correlator][integration_time]-description"
-                                      >
-                                        Desired integration period (seconds)
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.correlator.storage_cluster"
-                                    data-schematype="string"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="je-form-input-label"
-                                        for="specification[correlator][storage_cluster]"
-                                      >
-                                        Storage cluster
-                                      </label>
-                                      <select
-                                        aria-describedby="specification[correlator][storage_cluster]-description"
-                                        disabled=""
-                                        id="specification[correlator][storage_cluster]"
-                                        name="specification[correlator][storage_cluster]"
-                                      >
-                                        <option
-                                          value="CEP4"
-                                        >
-                                          CEP4
-                                        </option>
-                                        <option
-                                          value="DragNet"
-                                        >
-                                          DragNet
-                                        </option>
-                                      </select>
-                                      <div />
-                                      <p
-                                        class="je-form-input-label"
-                                        id="specification[correlator][storage_cluster]-description"
-                                      >
-                                        Cluster to write output to
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.correlator.topocentric_frequency_correction"
-                                    data-schematype="boolean"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="je-form-input-label"
-                                        for="specification[correlator][topocentric_frequency_correction]"
-                                      >
-                                        Topocentric Frequency Correction
-                                      </label>
-                                      <select
-                                        aria-describedby="specification[correlator][topocentric_frequency_correction]-description"
-                                        disabled=""
-                                        id="specification[correlator][topocentric_frequency_correction]"
-                                        name="specification[correlator][topocentric_frequency_correction]"
-                                      >
-                                        <option
-                                          value="undefined"
-                                        >
-                                           
-                                        </option>
-                                        <option
-                                          value="1"
-                                        >
-                                          true
-                                        </option>
-                                        <option
-                                          value=""
-                                        >
-                                          false
-                                        </option>
-                                      </select>
-                                      <div />
-                                      <p
-                                        class="je-form-input-label"
-                                        id="specification[correlator][topocentric_frequency_correction]-description"
-                                      >
-                                        Correct frequencies for the Doppler shift caused by the Earth's rotation.
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.correlator.channels_per_subband"
-                                    data-schematype="integer"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="je-form-input-label"
-                                        for="specification[correlator][channels_per_subband]"
-                                      >
-                                        Channels/subband
-                                      </label>
-                                      <select
-                                        aria-describedby="specification[correlator][channels_per_subband]-description"
-                                        disabled=""
-                                        id="specification[correlator][channels_per_subband]"
-                                        name="specification[correlator][channels_per_subband]"
-                                      >
-                                        <option
-                                          value="8"
-                                        >
-                                          8
-                                        </option>
-                                        <option
-                                          value="16"
-                                        >
-                                          16
-                                        </option>
-                                        <option
-                                          value="32"
-                                        >
-                                          32
-                                        </option>
-                                        <option
-                                          value="64"
-                                        >
-                                          64
-                                        </option>
-                                        <option
-                                          value="128"
-                                        >
-                                          128
-                                        </option>
-                                        <option
-                                          value="256"
-                                        >
-                                          256
-                                        </option>
-                                        <option
-                                          value="512"
-                                        >
-                                          512
-                                        </option>
-                                        <option
-                                          value="1024"
-                                        >
-                                          1024
-                                        </option>
-                                      </select>
-                                      <div />
-                                      <p
-                                        class="je-form-input-label"
-                                        id="specification[correlator][channels_per_subband]-description"
-                                      >
-                                        Number of frequency bands per subband
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.correlator.frequency_resolution"
-                                    data-schematype="string"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="je-form-input-label"
-                                        for="specification[correlator][frequency_resolution]"
-                                      >
-                                        Frequency Resolution (kHz)
-                                      </label>
-                                      <input
-                                        disabled=""
-                                        id="specification[correlator][frequency_resolution]"
-                                        name="specification[correlator][frequency_resolution]"
-                                        type="text"
-                                      />
-                                    </div>
-                                    <div />
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.correlator.time_resolution"
-                                    data-schematype="string"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="je-form-input-label"
-                                        for="specification[correlator][time_resolution]"
-                                      >
-                                        Time Resolution (sec)
-                                      </label>
-                                      <input
-                                        disabled=""
-                                        id="specification[correlator][time_resolution]"
-                                        name="specification[correlator][time_resolution]"
-                                        type="text"
-                                      />
-                                    </div>
-                                    <div />
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div />
-                        </div>
-                      </div>
-                      <div
-                        class="row"
-                      >
-                        <div
-                          data-schemapath="specification.duration"
-                          data-schematype="string"
-                        >
-                          <div
-                            class="form-control"
-                          >
-                            <label
-                              class="je-form-input-label"
-                              for="specification[duration]"
-                            >
-                              Duration
-                            </label>
-                            <input
-                              aria-describedby="specification[duration]-description"
-                              disabled=""
-                              id="specification[duration]"
-                              name="specification[duration]"
-                              placeholder="HH:mm:ss"
-                              type="text"
-                            />
-                            <div />
-                            <p
-                              class="je-form-input-label"
-                              id="specification[duration]-description"
-                            >
-                              Duration of this observation  (Hours:Minutes:Seconds) (Hours:Minutes:Seconds) (Hours:Minutes:Seconds)
-                            </p>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        class="row"
-                      >
-                        <div
-                          class="je-object__container"
-                          data-schemapath="specification.station_configuration"
-                          data-schematype="object"
-                        >
-                          <span
-                            class="je-header je-object__title"
-                          >
-                            <button
-                              class="json-editor-btn-collapse json-editor-btntype-toggle"
-                              title="Collapse"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-caret-down"
-                              />
-                            </button>
-                            <span>
-                              station_configuration
-                            </span>
-                          </span>
-                          <span
-                            class="je-object__controls"
-                          >
-                            <div
-                              class="je-modal"
-                              style="display: none;"
-                            >
-                              <label
-                                for="specification.station_configuration-edit-json-textarea"
-                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                              >
-                                Edit JSON
-                              </label>
-                              <textarea
-                                aria-labelledby="specification.station_configuration-edit-json-textarea"
-                                class="je-textarea je-edit-json--textarea"
-                                id="specification.station_configuration-edit-json-textarea"
-                              />
-                              <button
-                                class="json-editor-btn-save json-editor-btntype-save"
-                                title="Save"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-save"
-                                />
-                              </button>
-                              <button
-                                class="json-editor-btn-copy json-editor-btntype-copy"
-                                title="Copy"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-copy"
-                                />
-                              </button>
-                              <button
-                                class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                title="Cancel"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-ban"
-                                />
-                              </button>
-                            </div>
-                            <div
-                              class="je-modal"
-                              style="display: none;"
-                            >
-                              <div
-                                class="property-selector"
-                              />
-                              <label
-                                for="specification.station_configuration-property-selector"
-                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                              >
-                                Properties
-                              </label>
-                              <input
-                                aria-labelledby="specification.station_configuration-property-selector"
-                                class="property-selector-input"
-                                id="specification.station_configuration-property-selector"
-                                placeholder="Property name..."
-                                type="text"
-                              />
-                              <button
-                                class="json-editor-btn-add json-editor-btntype-add"
-                                title="Add"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-plus"
-                                />
-                              </button>
-                              <div
-                                style="clear: both;"
-                              />
-                            </div>
-                            <button
-                              class="json-editor-btn-edit json-editor-btntype-editjson"
-                              disabled=""
-                              style="display: none;"
-                              title="Edit JSON"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-pen"
-                              />
-                            </button>
-                            <button
-                              class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                              disabled=""
-                              style="display: none;"
-                              title="Object Properties"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-list"
-                              />
-                            </button>
-                          </span>
-                          <div
-                            style="display: none;"
-                          />
-                          <div
-                            class="je-indented-panel"
-                          >
-                            <div>
-                              <div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.station_configuration.SAPs"
-                                    data-schematype="array"
-                                  >
-                                    <span
-                                      class="je-header"
-                                    >
-                                      <button
-                                        class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                        title="Collapse"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-caret-down"
-                                        />
-                                      </button>
-                                      <span>
-                                        SAPs
-                                      </span>
-                                      <span
-                                        class="je-header-button-holder"
-                                      />
-                                    </span>
-                                    <div />
-                                    <p>
-                                      Station beams
-                                    </p>
-                                    <div
-                                      style="display: none;"
-                                    />
-                                    <div
-                                      class="je-indented-panel"
-                                    >
-                                      <div>
-                                        <div
-                                          class="je-child-editor-holder je-object__container"
-                                          data-schemapath="specification.station_configuration.SAPs.0"
-                                          data-schematype="object"
-                                        >
-                                          <span
-                                            class="je-header je-object__title"
-                                          >
-                                            <button
-                                              class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                              title="Collapse"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-caret-down"
-                                              />
-                                            </button>
-                                            <span>
-                                              0 - Polaris
-                                            </span>
-                                          </span>
-                                          <span
-                                            class="je-object__controls"
-                                          >
-                                            <div
-                                              class="je-modal"
-                                              style="display: none;"
-                                            >
-                                              <label
-                                                for="specification.station_configuration.SAPs.0-edit-json-textarea"
-                                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                              >
-                                                Edit JSON
-                                              </label>
-                                              <textarea
-                                                aria-labelledby="specification.station_configuration.SAPs.0-edit-json-textarea"
-                                                class="je-textarea je-edit-json--textarea"
-                                                id="specification.station_configuration.SAPs.0-edit-json-textarea"
-                                              />
-                                              <button
-                                                class="json-editor-btn-save json-editor-btntype-save"
-                                                title="Save"
-                                                type="button"
-                                              >
-                                                <i
-                                                  class="fas fa-save"
-                                                />
-                                              </button>
-                                              <button
-                                                class="json-editor-btn-copy json-editor-btntype-copy"
-                                                title="Copy"
-                                                type="button"
-                                              >
-                                                <i
-                                                  class="fas fa-copy"
-                                                />
-                                              </button>
-                                              <button
-                                                class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                                title="Cancel"
-                                                type="button"
-                                              >
-                                                <i
-                                                  class="fas fa-ban"
-                                                />
-                                              </button>
-                                            </div>
-                                            <div
-                                              class="je-modal"
-                                              style="display: none;"
-                                            >
-                                              <div
-                                                class="property-selector"
-                                              />
-                                              <label
-                                                for="specification.station_configuration.SAPs.0-property-selector"
-                                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                              >
-                                                Properties
-                                              </label>
-                                              <input
-                                                aria-labelledby="specification.station_configuration.SAPs.0-property-selector"
-                                                class="property-selector-input"
-                                                id="specification.station_configuration.SAPs.0-property-selector"
-                                                placeholder="Property name..."
-                                                type="text"
-                                              />
-                                              <button
-                                                class="json-editor-btn-add json-editor-btntype-add"
-                                                title="Add"
-                                                type="button"
-                                              >
-                                                <i
-                                                  class="fas fa-plus"
-                                                />
-                                              </button>
-                                              <div
-                                                style="clear: both;"
-                                              />
-                                            </div>
-                                            <button
-                                              class="json-editor-btn-edit json-editor-btntype-editjson"
-                                              disabled=""
-                                              style="display: none;"
-                                              title="Edit JSON"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-pen"
-                                              />
-                                            </button>
-                                            <button
-                                              class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                              disabled=""
-                                              style="display: none;"
-                                              title="Object Properties"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-list"
-                                              />
-                                            </button>
-                                          </span>
-                                          <div
-                                            style="display: none;"
-                                          />
-                                          <div
-                                            class="je-indented-panel"
-                                          >
-                                            <div>
-                                              <div>
-                                                <div
-                                                  class="row"
-                                                >
-                                                  <div
-                                                    class="je-object__container"
-                                                    data-schemapath="specification.station_configuration.SAPs.0.digital_pointing"
-                                                    data-schematype="object"
-                                                  >
-                                                    <span
-                                                      class="je-header je-object__title"
-                                                    >
-                                                      <button
-                                                        class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                                        title="Collapse"
-                                                        type="button"
-                                                      >
-                                                        <i
-                                                          class="fas fa-caret-down"
-                                                        />
-                                                      </button>
-                                                      <span>
-                                                        Digital pointing
-                                                      </span>
-                                                    </span>
-                                                    <span
-                                                      class="je-object__controls"
-                                                    >
-                                                      <div
-                                                        class="je-modal"
-                                                        style="display: none;"
-                                                      >
-                                                        <label
-                                                          for="specification.station_configuration.SAPs.0.digital_pointing-edit-json-textarea"
-                                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                        >
-                                                          Edit JSON
-                                                        </label>
-                                                        <textarea
-                                                          aria-labelledby="specification.station_configuration.SAPs.0.digital_pointing-edit-json-textarea"
-                                                          class="je-textarea je-edit-json--textarea"
-                                                          id="specification.station_configuration.SAPs.0.digital_pointing-edit-json-textarea"
-                                                        />
-                                                        <button
-                                                          class="json-editor-btn-save json-editor-btntype-save"
-                                                          title="Save"
-                                                          type="button"
-                                                        >
-                                                          <i
-                                                            class="fas fa-save"
-                                                          />
-                                                        </button>
-                                                        <button
-                                                          class="json-editor-btn-copy json-editor-btntype-copy"
-                                                          title="Copy"
-                                                          type="button"
-                                                        >
-                                                          <i
-                                                            class="fas fa-copy"
-                                                          />
-                                                        </button>
-                                                        <button
-                                                          class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                                          title="Cancel"
-                                                          type="button"
-                                                        >
-                                                          <i
-                                                            class="fas fa-ban"
-                                                          />
-                                                        </button>
-                                                      </div>
-                                                      <div
-                                                        class="je-modal"
-                                                        style="display: none;"
-                                                      >
-                                                        <div
-                                                          class="property-selector"
-                                                        />
-                                                        <label
-                                                          for="specification.station_configuration.SAPs.0.digital_pointing-property-selector"
-                                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                        >
-                                                          Properties
-                                                        </label>
-                                                        <input
-                                                          aria-labelledby="specification.station_configuration.SAPs.0.digital_pointing-property-selector"
-                                                          class="property-selector-input"
-                                                          id="specification.station_configuration.SAPs.0.digital_pointing-property-selector"
-                                                          placeholder="Property name..."
-                                                          type="text"
-                                                        />
-                                                        <button
-                                                          class="json-editor-btn-add json-editor-btntype-add"
-                                                          title="Add"
-                                                          type="button"
-                                                        >
-                                                          <i
-                                                            class="fas fa-plus"
-                                                          />
-                                                        </button>
-                                                        <div
-                                                          style="clear: both;"
-                                                        />
-                                                      </div>
-                                                      <button
-                                                        class="json-editor-btn-edit json-editor-btntype-editjson"
-                                                        disabled=""
-                                                        style="display: none;"
-                                                        title="Edit JSON"
-                                                        type="button"
-                                                      >
-                                                        <i
-                                                          class="fas fa-pen"
-                                                        />
-                                                      </button>
-                                                      <button
-                                                        class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                                        disabled=""
-                                                        style="display: none;"
-                                                        title="Object Properties"
-                                                        type="button"
-                                                      >
-                                                        <i
-                                                          class="fas fa-list"
-                                                        />
-                                                      </button>
-                                                    </span>
-                                                    <div
-                                                      style="display: none;"
-                                                    />
-                                                    <div
-                                                      class="je-indented-panel"
-                                                    >
-                                                      <div>
-                                                        <div>
-                                                          <div
-                                                            class="row"
-                                                          >
-                                                            <div
-                                                              data-schemapath="specification.station_configuration.SAPs.0.digital_pointing.angle1"
-                                                              data-schematype="string"
-                                                            >
-                                                              <div
-                                                                class="form-control"
-                                                              >
-                                                                <label
-                                                                  class="required je-form-input-label"
-                                                                  for="specification[station_configuration][SAPs][0][digital_pointing][angle1]"
-                                                                >
-                                                                  Angle 1
-                                                                </label>
-                                                                <input
-                                                                  aria-describedby="specification[station_configuration][SAPs][0][digital_pointing][angle1]-description"
-                                                                  disabled=""
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][angle1]"
-                                                                  name="specification[station_configuration][SAPs][0][digital_pointing][angle1]"
-                                                                  placeholder="Hours or Radian"
-                                                                  type="text"
-                                                                />
-                                                                <div />
-                                                                <p
-                                                                  class="je-form-input-label"
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][angle1]-description"
-                                                                >
-                                                                  First angle (e.g. RA)(Supported Formats: '10h15m10.1234s', '10:15:10.1234hours', '10.4187hours', '10d15m10.1234s', '10:15:10.1234degrees', '10.2528degrees', '2.7276')
-                                                                </p>
-                                                              </div>
-                                                            </div>
-                                                          </div>
-                                                          <div
-                                                            class="row"
-                                                          >
-                                                            <div
-                                                              data-schemapath="specification.station_configuration.SAPs.0.digital_pointing.angle2"
-                                                              data-schematype="string"
-                                                            >
-                                                              <div
-                                                                class="form-control"
-                                                              >
-                                                                <label
-                                                                  class="required je-form-input-label"
-                                                                  for="specification[station_configuration][SAPs][0][digital_pointing][angle2]"
-                                                                >
-                                                                  Angle 2
-                                                                </label>
-                                                                <input
-                                                                  aria-describedby="specification[station_configuration][SAPs][0][digital_pointing][angle2]-description"
-                                                                  disabled=""
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][angle2]"
-                                                                  name="specification[station_configuration][SAPs][0][digital_pointing][angle2]"
-                                                                  placeholder="Degrees or Radian"
-                                                                  type="text"
-                                                                />
-                                                                <div />
-                                                                <p
-                                                                  class="je-form-input-label"
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][angle2]-description"
-                                                                >
-                                                                  Second angle (e.g. DEC)(Supported Formats: '10d15m10.1234s', '10:15:10.1234degrees', '10.2528degrees', '0.1789')
-                                                                </p>
-                                                              </div>
-                                                            </div>
-                                                          </div>
-                                                          <div
-                                                            class="row"
-                                                          >
-                                                            <div
-                                                              data-schemapath="specification.station_configuration.SAPs.0.digital_pointing.direction_type"
-                                                              data-schematype="string"
-                                                            >
-                                                              <div
-                                                                class="form-control"
-                                                              >
-                                                                <label
-                                                                  class="je-form-input-label"
-                                                                  for="specification[station_configuration][SAPs][0][digital_pointing][direction_type]"
-                                                                >
-                                                                  Reference frame
-                                                                </label>
-                                                                <select
-                                                                  disabled=""
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][direction_type]"
-                                                                  name="specification[station_configuration][SAPs][0][digital_pointing][direction_type]"
-                                                                >
-                                                                  <option
-                                                                    value="J2000"
-                                                                  >
-                                                                    J2000
-                                                                  </option>
-                                                                  <option
-                                                                    value="AZELGEO"
-                                                                  >
-                                                                    AZELGEO
-                                                                  </option>
-                                                                  <option
-                                                                    value="LMN"
-                                                                  >
-                                                                    LMN
-                                                                  </option>
-                                                                  <option
-                                                                    value="SUN"
-                                                                  >
-                                                                    SUN
-                                                                  </option>
-                                                                  <option
-                                                                    value="MOON"
-                                                                  >
-                                                                    MOON
-                                                                  </option>
-                                                                  <option
-                                                                    value="MERCURY"
-                                                                  >
-                                                                    MERCURY
-                                                                  </option>
-                                                                  <option
-                                                                    value="VENUS"
-                                                                  >
-                                                                    VENUS
-                                                                  </option>
-                                                                  <option
-                                                                    value="MARS"
-                                                                  >
-                                                                    MARS
-                                                                  </option>
-                                                                  <option
-                                                                    value="JUPITER"
-                                                                  >
-                                                                    JUPITER
-                                                                  </option>
-                                                                  <option
-                                                                    value="SATURN"
-                                                                  >
-                                                                    SATURN
-                                                                  </option>
-                                                                  <option
-                                                                    value="URANUS"
-                                                                  >
-                                                                    URANUS
-                                                                  </option>
-                                                                  <option
-                                                                    value="NEPTUNE"
-                                                                  >
-                                                                    NEPTUNE
-                                                                  </option>
-                                                                  <option
-                                                                    value="PLUTO"
-                                                                  >
-                                                                    PLUTO
-                                                                  </option>
-                                                                </select>
-                                                              </div>
-                                                              <div />
-                                                            </div>
-                                                          </div>
-                                                          <div
-                                                            class="row"
-                                                          >
-                                                            <div
-                                                              data-schemapath="specification.station_configuration.SAPs.0.digital_pointing.target"
-                                                              data-schematype="string"
-                                                            >
-                                                              <div
-                                                                class="form-control"
-                                                              >
-                                                                <label
-                                                                  class="required je-form-input-label"
-                                                                  for="specification[station_configuration][SAPs][0][digital_pointing][target]"
-                                                                >
-                                                                  Target
-                                                                </label>
-                                                                <input
-                                                                  aria-describedby="specification[station_configuration][SAPs][0][digital_pointing][target]-description"
-                                                                  disabled=""
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][target]"
-                                                                  name="specification[station_configuration][SAPs][0][digital_pointing][target]"
-                                                                  pattern=".{1,}"
-                                                                  type="text"
-                                                                />
-                                                                <div />
-                                                                <p
-                                                                  class="je-form-input-label"
-                                                                  id="specification[station_configuration][SAPs][0][digital_pointing][target]-description"
-                                                                >
-                                                                  Description of where this beam points at
-                                                                </p>
-                                                              </div>
-                                                            </div>
-                                                          </div>
-                                                        </div>
-                                                      </div>
-                                                    </div>
-                                                    <div />
-                                                  </div>
-                                                </div>
-                                                <div
-                                                  class="row"
-                                                >
-                                                  <div
-                                                    data-schemapath="specification.station_configuration.SAPs.0.name"
-                                                    data-schematype="string"
-                                                  >
-                                                    <div
-                                                      class="form-control"
-                                                    >
-                                                      <label
-                                                        class="required je-form-input-label"
-                                                        for="specification[station_configuration][SAPs][0][name]"
-                                                      >
-                                                        Name
-                                                      </label>
-                                                      <input
-                                                        aria-describedby="specification[station_configuration][SAPs][0][name]-description"
-                                                        disabled=""
-                                                        id="specification[station_configuration][SAPs][0][name]"
-                                                        name="specification[station_configuration][SAPs][0][name]"
-                                                        pattern=".{1,}"
-                                                        type="text"
-                                                      />
-                                                      <div />
-                                                      <p
-                                                        class="je-form-input-label"
-                                                        id="specification[station_configuration][SAPs][0][name]-description"
-                                                      >
-                                                        Identifier for this beam
-                                                      </p>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                                <div
-                                                  class="row"
-                                                >
-                                                  <div
-                                                    data-schemapath="specification.station_configuration.SAPs.0.subbands"
-                                                    data-schematype="string"
-                                                  >
-                                                    <div
-                                                      class="form-control"
-                                                    >
-                                                      <label
-                                                        class="required je-form-input-label"
-                                                        for="specification[station_configuration][SAPs][0][subbands]"
-                                                      >
-                                                        Subband list
-                                                      </label>
-                                                      <input
-                                                        aria-describedby="specification[station_configuration][SAPs][0][subbands]-description"
-                                                        disabled=""
-                                                        id="specification[station_configuration][SAPs][0][subbands]"
-                                                        name="specification[station_configuration][SAPs][0][subbands]"
-                                                        type="text"
-                                                      />
-                                                      <div />
-                                                      <p
-                                                        class="je-form-input-label"
-                                                        id="specification[station_configuration][SAPs][0][subbands]-description"
-                                                      >
-                                                        For Range enter Start and End seperated by 2 dots. Mulitple ranges can be separated by comma. Minimum should be 0 and maximum should be 511. For exmaple 11..20, 30..50
-                                                      </p>
-                                                      <div
-                                                        class="errmsg"
-                                                        role="alert"
-                                                        style="color: red; display: none;"
-                                                      >
-                                                        Not a valid input for Subband List.
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                                <div
-                                                  class="row"
-                                                >
-                                                  <div
-                                                    data-schemapath="specification.station_configuration.SAPs.0.frequency"
-                                                    data-schematype="string"
-                                                  >
-                                                    <div
-                                                      class="form-control"
-                                                    >
-                                                      <label
-                                                        class="je-form-input-label"
-                                                        for="specification[station_configuration][SAPs][0][frequency]"
-                                                      >
-                                                        Frequency(MHz)
-                                                      </label>
-                                                      <input
-                                                        disabled=""
-                                                        id="specification[station_configuration][SAPs][0][frequency]"
-                                                        name="specification[station_configuration][SAPs][0][frequency]"
-                                                        type="text"
-                                                      />
-                                                    </div>
-                                                    <div />
-                                                  </div>
-                                                </div>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div />
-                                          <span>
-                                            <button
-                                              class="json-editor-btn-delete delete json-editor-btntype-delete"
-                                              data-i="0"
-                                              disabled=""
-                                              style="display: none;"
-                                              title="Delete SAP"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-trash"
-                                              />
-                                            </button>
-                                            <button
-                                              class="json-editor-btn-movedown movedown json-editor-btntype-move"
-                                              data-i="0"
-                                              disabled=""
-                                              style="display: none;"
-                                              title="Move down"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-arrow-down"
-                                              />
-                                            </button>
-                                          </span>
-                                        </div>
-                                      </div>
-                                      <span
-                                        style="display: inline-block;"
-                                      >
-                                        <button
-                                          class="json-editor-btn-add json-editor-btntype-add"
-                                          disabled=""
-                                          title="Add SAP"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-plus"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-subtract json-editor-btntype-deletelast"
-                                          disabled=""
-                                          style="display: none;"
-                                          title="Delete Last SAP"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-minus"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-delete json-editor-btntype-deleteall"
-                                          disabled=""
-                                          style="display: none;"
-                                          title="Delete All"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-trash"
-                                          />
-                                        </button>
-                                      </span>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.station_configuration.antenna_set"
-                                    data-schematype="string"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="required je-form-input-label"
-                                        for="specification[station_configuration][antenna_set]"
-                                      >
-                                        Antenna set
-                                      </label>
-                                      <select
-                                        aria-describedby="specification[station_configuration][antenna_set]-description"
-                                        disabled=""
-                                        id="specification[station_configuration][antenna_set]"
-                                        name="specification[station_configuration][antenna_set]"
-                                      >
-                                        <option
-                                          value="HBA_DUAL"
-                                        >
-                                          HBA_DUAL
-                                        </option>
-                                        <option
-                                          value="HBA_DUAL_INNER"
-                                        >
-                                          HBA_DUAL_INNER
-                                        </option>
-                                        <option
-                                          value="HBA_ONE"
-                                        >
-                                          HBA_ONE
-                                        </option>
-                                        <option
-                                          value="HBA_ONE_INNER"
-                                        >
-                                          HBA_ONE_INNER
-                                        </option>
-                                        <option
-                                          value="HBA_ZERO"
-                                        >
-                                          HBA_ZERO
-                                        </option>
-                                        <option
-                                          value="HBA_ZERO_INNER"
-                                        >
-                                          HBA_ZERO_INNER
-                                        </option>
-                                        <option
-                                          value="LBA_INNER"
-                                        >
-                                          LBA_INNER
-                                        </option>
-                                        <option
-                                          value="LBA_OUTER"
-                                        >
-                                          LBA_OUTER
-                                        </option>
-                                        <option
-                                          value="LBA_SPARSE_EVEN"
-                                        >
-                                          LBA_SPARSE_EVEN
-                                        </option>
-                                        <option
-                                          value="LBA_SPARSE_ODD"
-                                        >
-                                          LBA_SPARSE_ODD
-                                        </option>
-                                        <option
-                                          value="LBA_ALL"
-                                        >
-                                          LBA_ALL
-                                        </option>
-                                      </select>
-                                      <div />
-                                      <p
-                                        class="je-form-input-label"
-                                        id="specification[station_configuration][antenna_set]-description"
-                                      >
-                                        Fields & antennas to use
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.station_configuration.filter"
-                                    data-schematype="string"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="required je-form-input-label"
-                                        for="specification[station_configuration][filter]"
-                                      >
-                                        Band-pass filter
-                                      </label>
-                                      <select
-                                        aria-describedby="specification[station_configuration][filter]-description"
-                                        disabled=""
-                                        id="specification[station_configuration][filter]"
-                                        name="specification[station_configuration][filter]"
-                                      >
-                                        <option
-                                          value="LBA_10_90"
-                                        >
-                                          LBA_10_90
-                                        </option>
-                                        <option
-                                          value="LBA_30_90"
-                                        >
-                                          LBA_30_90
-                                        </option>
-                                        <option
-                                          value="HBA_110_190"
-                                        >
-                                          HBA_110_190
-                                        </option>
-                                        <option
-                                          value="HBA_210_250"
-                                        >
-                                          HBA_210_250
-                                        </option>
-                                      </select>
-                                      <div />
-                                      <p
-                                        class="je-form-input-label"
-                                        id="specification[station_configuration][filter]-description"
-                                      >
-                                        Must match antenna type
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.station_configuration.station_groups"
-                                    data-schematype="array"
-                                  >
-                                    <span
-                                      class="je-header"
-                                    >
-                                      <button
-                                        class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                        title="Collapse"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-caret-down"
-                                        />
-                                      </button>
-                                      <span>
-                                        Station groups
-                                      </span>
-                                      <span
-                                        class="je-header-button-holder"
-                                      />
-                                    </span>
-                                    <div />
-                                    <p>
-                                      One or more predefined or custom groups of stations
-                                    </p>
-                                    <div
-                                      style="display: none;"
-                                    />
-                                    <div
-                                      class="je-indented-panel"
-                                    >
-                                      <div>
-                                        <div
-                                          class="je-indented-panel"
-                                          data-schemapath="specification.station_configuration.station_groups.0"
-                                          data-schematype="object"
-                                        >
-                                          <b>
-                                            Station group 1
-                                          </b>
-                                          <label
-                                            for="specification[station_configuration][station_groups][0]switcher"
-                                            style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                          >
-                                            specification[station_configuration][station_groups][0] switcher
-                                          </label>
-                                          <select
-                                            class="je-switcher"
-                                            disabled=""
-                                            id="specification[station_configuration][station_groups][0]switcher"
-                                          >
-                                            <option
-                                              value="Superterp"
-                                            >
-                                              Superterp
-                                            </option>
-                                            <option
-                                              value="Core"
-                                            >
-                                              Core
-                                            </option>
-                                            <option
-                                              value="Remote"
-                                            >
-                                              Remote
-                                            </option>
-                                            <option
-                                              value="Dutch"
-                                            >
-                                              Dutch
-                                            </option>
-                                            <option
-                                              value="International"
-                                            >
-                                              International
-                                            </option>
-                                            <option
-                                              value="International required"
-                                            >
-                                              International required
-                                            </option>
-                                            <option
-                                              value="All"
-                                            >
-                                              All
-                                            </option>
-                                            <option
-                                              value="Custom"
-                                            >
-                                              Custom
-                                            </option>
-                                          </select>
-                                          <div>
-                                            <div
-                                              class="je-child-editor-holder je-object__container"
-                                              data-schemapath="specification.station_configuration.station_groups.0"
-                                              data-schematype="object"
-                                              style=""
-                                            >
-                                              <span
-                                                class="je-header je-object__title"
-                                              >
-                                                <button
-                                                  class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                                  title="Collapse"
-                                                  type="button"
-                                                >
-                                                  <i
-                                                    class="fas fa-caret-down"
-                                                  />
-                                                </button>
-                                                <span
-                                                  style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                >
-                                                  Superterp
-                                                </span>
-                                              </span>
-                                              <span
-                                                class="je-object__controls"
-                                              >
-                                                <div
-                                                  class="je-modal"
-                                                  style="display: none;"
-                                                >
-                                                  <label
-                                                    for="specification.station_configuration.station_groups.0-edit-json-textarea"
-                                                    style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                  >
-                                                    Edit JSON
-                                                  </label>
-                                                  <textarea
-                                                    aria-labelledby="specification.station_configuration.station_groups.0-edit-json-textarea"
-                                                    class="je-textarea je-edit-json--textarea"
-                                                    id="specification.station_configuration.station_groups.0-edit-json-textarea"
-                                                  />
-                                                  <button
-                                                    class="json-editor-btn-save json-editor-btntype-save"
-                                                    title="Save"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-save"
-                                                    />
-                                                  </button>
-                                                  <button
-                                                    class="json-editor-btn-copy json-editor-btntype-copy"
-                                                    title="Copy"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-copy"
-                                                    />
-                                                  </button>
-                                                  <button
-                                                    class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                                    title="Cancel"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-ban"
-                                                    />
-                                                  </button>
-                                                </div>
-                                                <div
-                                                  class="je-modal"
-                                                  style="display: none;"
-                                                >
-                                                  <div
-                                                    class="property-selector"
-                                                  />
-                                                  <label
-                                                    for="specification.station_configuration.station_groups.0-property-selector"
-                                                    style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                  >
-                                                    Properties
-                                                  </label>
-                                                  <input
-                                                    aria-labelledby="specification.station_configuration.station_groups.0-property-selector"
-                                                    class="property-selector-input"
-                                                    id="specification.station_configuration.station_groups.0-property-selector"
-                                                    placeholder="Property name..."
-                                                    type="text"
-                                                  />
-                                                  <button
-                                                    class="json-editor-btn-add json-editor-btntype-add"
-                                                    title="Add"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-plus"
-                                                    />
-                                                  </button>
-                                                  <div
-                                                    style="clear: both;"
-                                                  />
-                                                </div>
-                                                <button
-                                                  class="json-editor-btn-edit json-editor-btntype-editjson"
-                                                  disabled=""
-                                                  style="display: none;"
-                                                  title="Edit JSON"
-                                                  type="button"
-                                                >
-                                                  <i
-                                                    class="fas fa-pen"
-                                                  />
-                                                </button>
-                                                <button
-                                                  class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                                  disabled=""
-                                                  style="display: none;"
-                                                  title="Object Properties"
-                                                  type="button"
-                                                >
-                                                  <i
-                                                    class="fas fa-list"
-                                                  />
-                                                </button>
-                                              </span>
-                                              <div />
-                                              <p>
-                                                The group of all stations on the Superterp
-                                              </p>
-                                              <div
-                                                style="display: none;"
-                                              />
-                                              <div
-                                                class="je-indented-panel"
-                                              >
-                                                <div>
-                                                  <div>
-                                                    <div
-                                                      class="row"
-                                                    >
-                                                      <div
-                                                        data-schemapath="specification.station_configuration.station_groups.0.stations"
-                                                        data-schematype="array"
-                                                      >
-                                                        <div
-                                                          class="form-control"
-                                                        >
-                                                          <label
-                                                            class="required je-form-input-label"
-                                                            for="specification[station_configuration][station_groups][0][stations]"
-                                                          >
-                                                            stations
-                                                          </label>
-                                                          <select
-                                                            disabled=""
-                                                            id="specification[station_configuration][station_groups][0][stations]"
-                                                            multiple="multiple"
-                                                            name="specification[station_configuration][station_groups][0][stations]"
-                                                            size="10"
-                                                          >
-                                                            <option
-                                                              value="CS001"
-                                                            >
-                                                              CS001
-                                                            </option>
-                                                            <option
-                                                              value="CS002"
-                                                            >
-                                                              CS002
-                                                            </option>
-                                                            <option
-                                                              value="CS003"
-                                                            >
-                                                              CS003
-                                                            </option>
-                                                            <option
-                                                              value="CS004"
-                                                            >
-                                                              CS004
-                                                            </option>
-                                                            <option
-                                                              value="CS005"
-                                                            >
-                                                              CS005
-                                                            </option>
-                                                            <option
-                                                              value="CS006"
-                                                            >
-                                                              CS006
-                                                            </option>
-                                                            <option
-                                                              value="CS007"
-                                                            >
-                                                              CS007
-                                                            </option>
-                                                            <option
-                                                              value="CS011"
-                                                            >
-                                                              CS011
-                                                            </option>
-                                                            <option
-                                                              value="CS013"
-                                                            >
-                                                              CS013
-                                                            </option>
-                                                            <option
-                                                              value="CS017"
-                                                            >
-                                                              CS017
-                                                            </option>
-                                                            <option
-                                                              value="CS021"
-                                                            >
-                                                              CS021
-                                                            </option>
-                                                            <option
-                                                              value="CS024"
-                                                            >
-                                                              CS024
-                                                            </option>
-                                                            <option
-                                                              value="CS026"
-                                                            >
-                                                              CS026
-                                                            </option>
-                                                            <option
-                                                              value="CS028"
-                                                            >
-                                                              CS028
-                                                            </option>
-                                                            <option
-                                                              value="CS030"
-                                                            >
-                                                              CS030
-                                                            </option>
-                                                            <option
-                                                              value="CS031"
-                                                            >
-                                                              CS031
-                                                            </option>
-                                                            <option
-                                                              value="CS032"
-                                                            >
-                                                              CS032
-                                                            </option>
-                                                            <option
-                                                              value="CS101"
-                                                            >
-                                                              CS101
-                                                            </option>
-                                                            <option
-                                                              value="CS103"
-                                                            >
-                                                              CS103
-                                                            </option>
-                                                            <option
-                                                              value="CS201"
-                                                            >
-                                                              CS201
-                                                            </option>
-                                                            <option
-                                                              value="CS301"
-                                                            >
-                                                              CS301
-                                                            </option>
-                                                            <option
-                                                              value="CS302"
-                                                            >
-                                                              CS302
-                                                            </option>
-                                                            <option
-                                                              value="CS401"
-                                                            >
-                                                              CS401
-                                                            </option>
-                                                            <option
-                                                              value="CS501"
-                                                            >
-                                                              CS501
-                                                            </option>
-                                                            <option
-                                                              value="RS106"
-                                                            >
-                                                              RS106
-                                                            </option>
-                                                            <option
-                                                              value="RS205"
-                                                            >
-                                                              RS205
-                                                            </option>
-                                                            <option
-                                                              value="RS208"
-                                                            >
-                                                              RS208
-                                                            </option>
-                                                            <option
-                                                              value="RS210"
-                                                            >
-                                                              RS210
-                                                            </option>
-                                                            <option
-                                                              value="RS305"
-                                                            >
-                                                              RS305
-                                                            </option>
-                                                            <option
-                                                              value="RS306"
-                                                            >
-                                                              RS306
-                                                            </option>
-                                                            <option
-                                                              value="RS307"
-                                                            >
-                                                              RS307
-                                                            </option>
-                                                            <option
-                                                              value="RS310"
-                                                            >
-                                                              RS310
-                                                            </option>
-                                                            <option
-                                                              value="RS406"
-                                                            >
-                                                              RS406
-                                                            </option>
-                                                            <option
-                                                              value="RS407"
-                                                            >
-                                                              RS407
-                                                            </option>
-                                                            <option
-                                                              value="RS409"
-                                                            >
-                                                              RS409
-                                                            </option>
-                                                            <option
-                                                              value="RS503"
-                                                            >
-                                                              RS503
-                                                            </option>
-                                                            <option
-                                                              value="RS508"
-                                                            >
-                                                              RS508
-                                                            </option>
-                                                            <option
-                                                              value="RS509"
-                                                            >
-                                                              RS509
-                                                            </option>
-                                                            <option
-                                                              value="DE601"
-                                                            >
-                                                              DE601
-                                                            </option>
-                                                            <option
-                                                              value="DE602"
-                                                            >
-                                                              DE602
-                                                            </option>
-                                                            <option
-                                                              value="DE603"
-                                                            >
-                                                              DE603
-                                                            </option>
-                                                            <option
-                                                              value="DE604"
-                                                            >
-                                                              DE604
-                                                            </option>
-                                                            <option
-                                                              value="DE605"
-                                                            >
-                                                              DE605
-                                                            </option>
-                                                            <option
-                                                              value="FR606"
-                                                            >
-                                                              FR606
-                                                            </option>
-                                                            <option
-                                                              value="SE607"
-                                                            >
-                                                              SE607
-                                                            </option>
-                                                            <option
-                                                              value="UK608"
-                                                            >
-                                                              UK608
-                                                            </option>
-                                                            <option
-                                                              value="DE609"
-                                                            >
-                                                              DE609
-                                                            </option>
-                                                            <option
-                                                              value="PL610"
-                                                            >
-                                                              PL610
-                                                            </option>
-                                                            <option
-                                                              value="PL611"
-                                                            >
-                                                              PL611
-                                                            </option>
-                                                            <option
-                                                              value="PL612"
-                                                            >
-                                                              PL612
-                                                            </option>
-                                                            <option
-                                                              value="IE613"
-                                                            >
-                                                              IE613
-                                                            </option>
-                                                            <option
-                                                              value="LV614"
-                                                            >
-                                                              LV614
-                                                            </option>
-                                                          </select>
-                                                        </div>
-                                                        <div />
-                                                      </div>
-                                                    </div>
-                                                    <div
-                                                      class="row"
-                                                    >
-                                                      <div
-                                                        data-schemapath="specification.station_configuration.station_groups.0.max_nr_missing"
-                                                        data-schematype="integer"
-                                                      >
-                                                        <div
-                                                          class="form-control"
-                                                        >
-                                                          <label
-                                                            class="required je-form-input-label"
-                                                            for="specification[station_configuration][station_groups][0][max_nr_missing]"
-                                                          >
-                                                            Maximum number of stations to omit
-                                                          </label>
-                                                          <input
-                                                            aria-describedby="specification[station_configuration][station_groups][0][max_nr_missing]-description"
-                                                            disabled=""
-                                                            id="specification[station_configuration][station_groups][0][max_nr_missing]"
-                                                            min="0"
-                                                            name="specification[station_configuration][station_groups][0][max_nr_missing]"
-                                                            type="text"
-                                                          />
-                                                          <div />
-                                                          <p
-                                                            class="je-form-input-label"
-                                                            id="specification[station_configuration][station_groups][0][max_nr_missing]-description"
-                                                          >
-                                                            Maximum number of stations that can be omitted from a group (due to maintenance for example)
-                                                          </p>
-                                                        </div>
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                              </div>
-                                            </div>
-                                            <div
-                                              class="je-child-editor-holder je-object__container"
-                                              data-schemapath="specification.station_configuration.station_groups.0"
-                                              data-schematype="object"
-                                              style="display: none;"
-                                            >
-                                              <span
-                                                class="je-header je-object__title"
-                                              >
-                                                <button
-                                                  class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                                  title="Collapse"
-                                                  type="button"
-                                                >
-                                                  <i
-                                                    class="fas fa-caret-down"
-                                                  />
-                                                </button>
-                                                <span
-                                                  style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                >
-                                                  Core
-                                                </span>
-                                              </span>
-                                              <span
-                                                class="je-object__controls"
-                                              >
-                                                <div
-                                                  class="je-modal"
-                                                  style="display: none;"
-                                                >
-                                                  <label
-                                                    for="specification.station_configuration.station_groups.0-edit-json-textarea"
-                                                    style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                  >
-                                                    Edit JSON
-                                                  </label>
-                                                  <textarea
-                                                    aria-labelledby="specification.station_configuration.station_groups.0-edit-json-textarea"
-                                                    class="je-textarea je-edit-json--textarea"
-                                                    id="specification.station_configuration.station_groups.0-edit-json-textarea"
-                                                  />
-                                                  <button
-                                                    class="json-editor-btn-save json-editor-btntype-save"
-                                                    title="Save"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-save"
-                                                    />
-                                                  </button>
-                                                  <button
-                                                    class="json-editor-btn-copy json-editor-btntype-copy"
-                                                    title="Copy"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-copy"
-                                                    />
-                                                  </button>
-                                                  <button
-                                                    class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                                    title="Cancel"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-ban"
-                                                    />
-                                                  </button>
-                                                </div>
-                                                <div
-                                                  class="je-modal"
-                                                  style="display: none;"
-                                                >
-                                                  <div
-                                                    class="property-selector"
-                                                  />
-                                                  <label
-                                                    for="specification.station_configuration.station_groups.0-property-selector"
-                                                    style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                                  >
-                                                    Properties
-                                                  </label>
-                                                  <input
-                                                    aria-labelledby="specification.station_configuration.station_groups.0-property-selector"
-                                                    class="property-selector-input"
-                                                    id="specification.station_configuration.station_groups.0-property-selector"
-                                                    placeholder="Property name..."
-                                                    type="text"
-                                                  />
-                                                  <button
-                                                    class="json-editor-btn-add json-editor-btntype-add"
-                                                    title="Add"
-                                                    type="button"
-                                                  >
-                                                    <i
-                                                      class="fas fa-plus"
-                                                    />
-                                                  </button>
-                                                  <div
-                                                    style="clear: both;"
-                                                  />
-                                                </div>
-                                                <button
-                                                  class="json-editor-btn-edit json-editor-btntype-editjson"
-                                                  disabled=""
-                                                  style="display: none;"
-                                                  title="Edit JSON"
-                                                  type="button"
-                                                >
-                                                  <i
-                                                    class="fas fa-pen"
-                                                  />
-                                                </button>
-                                                <button
-                                                  class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                                  disabled=""
-                                                  style="display: none;"
-                                                  title="Object Properties"
-                                                  type="button"
-                                                >
-                                                  <i
-                                                    class="fas fa-list"
-                                                  />
-                                                </button>
-                                              </span>
-                                              <div />
-                                              <p>
-                                                The group of all Core stations
-                                              </p>
-                                              <div
-                                                style="display: none;"
-                                              />
-                                              <div
-                                                class="je-indented-panel"
-                                              >
-                                                <div>
-                                                  <div>
-                                                    <div
-                                                      class="row"
-                                                    >
-                                                      <div
-                                                        data-schemapath="specification.station_configuration.station_groups.0.stations"
-                                                        data-schematype="array"
-                                                      >
-                                                        <div
-                                                          class="form-control"
-                                                        >
-                                                          <label
-                                                            class="required je-form-input-label"
-                                                            for="specification[station_configuration][station_groups][0][stations]"
-                                                          >
-                                                            stations
-                                                          </label>
-                                                          <select
-                                                            disabled=""
-                                                            id="specification[station_configuration][station_groups][0][stations]"
-                                                            multiple="multiple"
-                                                            size="10"
-                                                          >
-                                                            <option
-                                                              value="CS001"
-                                                            >
-                                                              CS001
-                                                            </option>
-                                                            <option
-                                                              value="CS002"
-                                                            >
-                                                              CS002
-                                                            </option>
-                                                            <option
-                                                              value="CS003"
-                                                            >
-                                                              CS003
-                                                            </option>
-                                                            <option
-                                                              value="CS004"
-                                                            >
-                                                              CS004
-                                                            </option>
-                                                            <option
-                                                              value="CS005"
-                                                            >
-                                                              CS005
-                                                            </option>
-                                                            <option
-                                                              value="CS006"
-                                                            >
-                                                              CS006
-                                                            </option>
-                                                            <option
-                                                              value="CS007"
-                                                            >
-                                                              CS007
-                                                            </option>
-                                                            <option
-                                                              value="CS011"
-                                                            >
-                                                              CS011
-                                                            </option>
-                                                            <option
-                                                              value="CS013"
-                                                            >
-                                                              CS013
-                                                            </option>
-                                                            <option
-                                                              value="CS017"
-                                                            >
-                                                              CS017
-                                                            </option>
-                                                            <option
-                                                              value="CS021"
-                                                            >
-                                                              CS021
-                                                            </option>
-                                                            <option
-                                                              value="CS024"
-                                                            >
-                                                              CS024
-                                                            </option>
-                                                            <option
-                                                              value="CS026"
-                                                            >
-                                                              CS026
-                                                            </option>
-                                                            <option
-                                                              value="CS028"
-                                                            >
-                                                              CS028
-                                                            </option>
-                                                            <option
-                                                              value="CS030"
-                                                            >
-                                                              CS030
-                                                            </option>
-                                                            <option
-                                                              value="CS031"
-                                                            >
-                                                              CS031
-                                                            </option>
-                                                            <option
-                                                              value="CS032"
-                                                            >
-                                                              CS032
-                                                            </option>
-                                                            <option
-                                                              value="CS101"
-                                                            >
-                                                              CS101
-                                                            </option>
-                                                            <option
-                                                              value="CS103"
-                                                            >
-                                                              CS103
-                                                            </option>
-                                                            <option
-                                                              value="CS201"
-                                                            >
-                                                              CS201
-                                                            </option>
-                                                            <option
-                                                              value="CS301"
-                                                            >
-                                                              CS301
-                                                            </option>
-                                                            <option
-                                                              value="CS302"
-                                                            >
-                                                              CS302
-                                                            </option>
-                                                            <option
-                                                              value="CS401"
-                                                            >
-                                                              CS401
-                                                            </option>
-                                                            <option
-                                                              value="CS501"
-                                                            >
-                                                              CS501
-                                                            </option>
-                                                            <option
-                                                              value="RS106"
-                                                            >
-                                                              RS106
-                                                            </option>
-                                                            <option
-                                                              value="RS205"
-                                                            >
-                                                              RS205
-                                                            </option>
-                                                            <option
-                                                              value="RS208"
-                                                            >
-                                                              RS208
-                                                            </option>
-                                                            <option
-                                                              value="RS210"
-                                                            >
-                                                              RS210
-                                                            </option>
-                                                            <option
-                                                              value="RS305"
-                                                            >
-                                                              RS305
-                                                            </option>
-                                                            <option
-                                                              value="RS306"
-                                                            >
-                                                              RS306
-                                                            </option>
-                                                            <option
-                                                              value="RS307"
-                                                            >
-                                                              RS307
-                                                            </option>
-                                                            <option
-                                                              value="RS310"
-                                                            >
-                                                              RS310
-                                                            </option>
-                                                            <option
-                                                              value="RS406"
-                                                            >
-                                                              RS406
-                                                            </option>
-                                                            <option
-                                                              value="RS407"
-                                                            >
-                                                              RS407
-                                                            </option>
-                                                            <option
-                                                              value="RS409"
-                                                            >
-                                                              RS409
-                                                            </option>
-                                                            <option
-                                                              value="RS503"
-                                                            >
-                                                              RS503
-                                                            </option>
-                                                            <option
-                                                              value="RS508"
-                                                            >
-                                                              RS508
-                                                            </option>
-                                                            <option
-                                                              value="RS509"
-                                                            >
-                                                              RS509
-                                                            </option>
-                                                            <option
-                                                              value="DE601"
-                                                            >
-                                                              DE601
-                                                            </option>
-                                                            <option
-                                                              value="DE602"
-                                                            >
-                                                              DE602
-                                                            </option>
-                                                            <option
-                                                              value="DE603"
-                                                            >
-                                                              DE603
-                                                            </option>
-                                                            <option
-                                                              value="DE604"
-                                                            >
-                                                              DE604
-                                                            </option>
-                                                            <option
-                                                              value="DE605"
-                                                            >
-                                                              DE605
-                                                            </option>
-                                                            <option
-                                                              value="FR606"
-                                                            >
-                                                              FR606
-                                                            </option>
-                                                            <option
-                                                              value="SE607"
-                                                            >
-                                                              SE607
-                                                            </option>
-                                                            <option
-                                                              value="UK608"
-                                                            >
-                                                              UK608
-                                                            </option>
-                                                            <option
-                                                              value="DE609"
-                                                            >
-                                                              DE609
-                                                            </option>
-                                                            <option
-                                                              value="PL610"
-                                                            >
-                                                              PL610
-                                                            </option>
-                                                            <option
-                                                              value="PL611"
-                                                            >
-                                                              PL611
-                                                            </option>
-                                                            <option
-                                                              value="PL612"
-                                                            >
-                                                              PL612
-                                                            </option>
-                                                            <option
-                                                              value="IE613"
-                                                            >
-                                                              IE613
-                                                            </option>
-                                                            <option
-                                                              value="LV614"
-                                                            >
-                                                              LV614
-                                                            </option>
-                                                          </select>
-                                                        </div>
-                                                        <div />
-                                                      </div>
-                                                    </div>
-                                                    <div
-                                                      class="row"
-                                                    >
-                                                      <div
-                                                        data-schemapath="specification.station_configuration.station_groups.0.max_nr_missing"
-                                                        data-schematype="integer"
-                                                      >
-                                                        <div
-                                                          class="form-control"
-                                                        >
-                                                          <label
-                                                            class="required je-form-input-label"
-                                                            for="specification[station_configuration][station_groups][0][max_nr_missing]"
-                                                          >
-                                                            Maximum number of stations to omit
-                                                          </label>
-                                                          <input
-                                                            aria-describedby="specification[station_configuration][station_groups][0][max_nr_missing]-description"
-                                                            disabled=""
-                                                            id="specification[station_configuration][station_groups][0][max_nr_missing]"
-                                                            min="0"
-                                                            type="text"
-                                                          />
-                                                          <div />
-                                                          <p
-                                                            class="je-form-input-label"
-                                                            id="specification[station_configuration][station_groups][0][max_nr_missing]-description"
-                                                          >
-                                                            Maximum number of stations that can be omitted from a group (due to maintenance for example)
-                                                          </p>
-                                                        </div>
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <span>
-                                            <button
-                                              class="json-editor-btn-delete delete json-editor-btntype-delete"
-                                              data-i="0"
-                                              disabled=""
-                                              style="display: none;"
-                                              title="Delete Station group"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-trash"
-                                              />
-                                            </button>
-                                            <button
-                                              class="json-editor-btn-movedown movedown json-editor-btntype-move"
-                                              data-i="0"
-                                              disabled=""
-                                              style="display: none;"
-                                              title="Move down"
-                                              type="button"
-                                            >
-                                              <i
-                                                class="fas fa-arrow-down"
-                                              />
-                                            </button>
-                                          </span>
-                                        </div>
-                                      </div>
-                                      <span
-                                        style="display: inline-block;"
-                                      >
-                                        <button
-                                          class="json-editor-btn-add json-editor-btntype-add"
-                                          disabled=""
-                                          title="Add Station group"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-plus"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-subtract json-editor-btntype-deletelast"
-                                          disabled=""
-                                          style="display: none;"
-                                          title="Delete Last Station group"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-minus"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-delete json-editor-btntype-deleteall"
-                                          disabled=""
-                                          style="display: none;"
-                                          title="Delete All"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-trash"
-                                          />
-                                        </button>
-                                      </span>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    class="je-object__container"
-                                    data-schemapath="specification.station_configuration.tile_beam"
-                                    data-schematype="object"
-                                  >
-                                    <span
-                                      class="je-header je-object__title"
-                                    >
-                                      <button
-                                        class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                        title="Collapse"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-caret-down"
-                                        />
-                                      </button>
-                                      <span>
-                                        Tile beam
-                                      </span>
-                                    </span>
-                                    <span
-                                      class="je-object__controls"
-                                    >
-                                      <div
-                                        class="je-modal"
-                                        style="display: none;"
-                                      >
-                                        <label
-                                          for="specification.station_configuration.tile_beam-edit-json-textarea"
-                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                        >
-                                          Edit JSON
-                                        </label>
-                                        <textarea
-                                          aria-labelledby="specification.station_configuration.tile_beam-edit-json-textarea"
-                                          class="je-textarea je-edit-json--textarea"
-                                          id="specification.station_configuration.tile_beam-edit-json-textarea"
-                                        />
-                                        <button
-                                          class="json-editor-btn-save json-editor-btntype-save"
-                                          title="Save"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-save"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-copy json-editor-btntype-copy"
-                                          title="Copy"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-copy"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                          title="Cancel"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-ban"
-                                          />
-                                        </button>
-                                      </div>
-                                      <div
-                                        class="je-modal"
-                                        style="display: none;"
-                                      >
-                                        <div
-                                          class="property-selector"
-                                        />
-                                        <label
-                                          for="specification.station_configuration.tile_beam-property-selector"
-                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                        >
-                                          Properties
-                                        </label>
-                                        <input
-                                          aria-labelledby="specification.station_configuration.tile_beam-property-selector"
-                                          class="property-selector-input"
-                                          id="specification.station_configuration.tile_beam-property-selector"
-                                          placeholder="Property name..."
-                                          type="text"
-                                        />
-                                        <button
-                                          class="json-editor-btn-add json-editor-btntype-add"
-                                          title="Add"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-plus"
-                                          />
-                                        </button>
-                                        <div
-                                          style="clear: both;"
-                                        />
-                                      </div>
-                                      <button
-                                        class="json-editor-btn-edit json-editor-btntype-editjson"
-                                        disabled=""
-                                        style="display: none;"
-                                        title="Edit JSON"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-pen"
-                                        />
-                                      </button>
-                                      <button
-                                        class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                        disabled=""
-                                        style="display: none;"
-                                        title="Object Properties"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-list"
-                                        />
-                                      </button>
-                                    </span>
-                                    <div />
-                                    <p>
-                                      HBA only
-                                    </p>
-                                    <div
-                                      style="display: none;"
-                                    />
-                                    <div
-                                      class="je-indented-panel"
-                                    >
-                                      <div>
-                                        <div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.station_configuration.tile_beam.angle1"
-                                              data-schematype="string"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[station_configuration][tile_beam][angle1]"
-                                                >
-                                                  Angle 1
-                                                </label>
-                                                <input
-                                                  aria-describedby="specification[station_configuration][tile_beam][angle1]-description"
-                                                  disabled=""
-                                                  id="specification[station_configuration][tile_beam][angle1]"
-                                                  name="specification[station_configuration][tile_beam][angle1]"
-                                                  placeholder="Hours or Radian"
-                                                  type="text"
-                                                />
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[station_configuration][tile_beam][angle1]-description"
-                                                >
-                                                  First angle (e.g. RA)(Supported Formats: '10h15m10.1234s', '10:15:10.1234hours', '10.4187hours', '10d15m10.1234s', '10:15:10.1234degrees', '10.2528degrees', '2.7276')
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.station_configuration.tile_beam.angle2"
-                                              data-schematype="string"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[station_configuration][tile_beam][angle2]"
-                                                >
-                                                  Angle 2
-                                                </label>
-                                                <input
-                                                  aria-describedby="specification[station_configuration][tile_beam][angle2]-description"
-                                                  disabled=""
-                                                  id="specification[station_configuration][tile_beam][angle2]"
-                                                  name="specification[station_configuration][tile_beam][angle2]"
-                                                  placeholder="Degrees or Radian"
-                                                  type="text"
-                                                />
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[station_configuration][tile_beam][angle2]-description"
-                                                >
-                                                  Second angle (e.g. DEC)(Supported Formats: '10d15m10.1234s', '10:15:10.1234degrees', '10.2528degrees', '0.1789')
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.station_configuration.tile_beam.direction_type"
-                                              data-schematype="string"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="je-form-input-label"
-                                                  for="specification[station_configuration][tile_beam][direction_type]"
-                                                >
-                                                  Reference frame
-                                                </label>
-                                                <select
-                                                  disabled=""
-                                                  id="specification[station_configuration][tile_beam][direction_type]"
-                                                  name="specification[station_configuration][tile_beam][direction_type]"
-                                                >
-                                                  <option
-                                                    value="J2000"
-                                                  >
-                                                    J2000
-                                                  </option>
-                                                  <option
-                                                    value="AZELGEO"
-                                                  >
-                                                    AZELGEO
-                                                  </option>
-                                                  <option
-                                                    value="LMN"
-                                                  >
-                                                    LMN
-                                                  </option>
-                                                  <option
-                                                    value="SUN"
-                                                  >
-                                                    SUN
-                                                  </option>
-                                                  <option
-                                                    value="MOON"
-                                                  >
-                                                    MOON
-                                                  </option>
-                                                  <option
-                                                    value="MERCURY"
-                                                  >
-                                                    MERCURY
-                                                  </option>
-                                                  <option
-                                                    value="VENUS"
-                                                  >
-                                                    VENUS
-                                                  </option>
-                                                  <option
-                                                    value="MARS"
-                                                  >
-                                                    MARS
-                                                  </option>
-                                                  <option
-                                                    value="JUPITER"
-                                                  >
-                                                    JUPITER
-                                                  </option>
-                                                  <option
-                                                    value="SATURN"
-                                                  >
-                                                    SATURN
-                                                  </option>
-                                                  <option
-                                                    value="URANUS"
-                                                  >
-                                                    URANUS
-                                                  </option>
-                                                  <option
-                                                    value="NEPTUNE"
-                                                  >
-                                                    NEPTUNE
-                                                  </option>
-                                                  <option
-                                                    value="PLUTO"
-                                                  >
-                                                    PLUTO
-                                                  </option>
-                                                </select>
-                                              </div>
-                                              <div />
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.station_configuration.tile_beam.target"
-                                              data-schematype="string"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[station_configuration][tile_beam][target]"
-                                                >
-                                                  Target
-                                                </label>
-                                                <input
-                                                  aria-describedby="specification[station_configuration][tile_beam][target]-description"
-                                                  disabled=""
-                                                  id="specification[station_configuration][tile_beam][target]"
-                                                  name="specification[station_configuration][tile_beam][target]"
-                                                  pattern=".{1,}"
-                                                  type="text"
-                                                />
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[station_configuration][tile_beam][target]-description"
-                                                >
-                                                  Description of where this beam points at
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div />
-                        </div>
-                      </div>
-                      <div
-                        class="row"
-                      >
-                        <div
-                          class="je-object__container"
-                          data-schemapath="specification.QA"
-                          data-schematype="object"
-                        >
-                          <span
-                            class="je-header je-object__title"
-                          >
-                            <button
-                              class="json-editor-btn-collapse json-editor-btntype-toggle"
-                              title="Collapse"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-caret-down"
-                              />
-                            </button>
-                            <span>
-                              QA
-                            </span>
-                          </span>
-                          <span
-                            class="je-object__controls"
-                          >
-                            <div
-                              class="je-modal"
-                              style="display: none;"
-                            >
-                              <label
-                                for="specification.QA-edit-json-textarea"
-                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                              >
-                                Edit JSON
-                              </label>
-                              <textarea
-                                aria-labelledby="specification.QA-edit-json-textarea"
-                                class="je-textarea je-edit-json--textarea"
-                                id="specification.QA-edit-json-textarea"
-                              />
-                              <button
-                                class="json-editor-btn-save json-editor-btntype-save"
-                                title="Save"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-save"
-                                />
-                              </button>
-                              <button
-                                class="json-editor-btn-copy json-editor-btntype-copy"
-                                title="Copy"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-copy"
-                                />
-                              </button>
-                              <button
-                                class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                title="Cancel"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-ban"
-                                />
-                              </button>
-                            </div>
-                            <div
-                              class="je-modal"
-                              style="display: none;"
-                            >
-                              <div
-                                class="property-selector"
-                              />
-                              <label
-                                for="specification.QA-property-selector"
-                                style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                              >
-                                Properties
-                              </label>
-                              <input
-                                aria-labelledby="specification.QA-property-selector"
-                                class="property-selector-input"
-                                id="specification.QA-property-selector"
-                                placeholder="Property name..."
-                                type="text"
-                              />
-                              <button
-                                class="json-editor-btn-add json-editor-btntype-add"
-                                title="Add"
-                                type="button"
-                              >
-                                <i
-                                  class="fas fa-plus"
-                                />
-                              </button>
-                              <div
-                                style="clear: both;"
-                              />
-                            </div>
-                            <button
-                              class="json-editor-btn-edit json-editor-btntype-editjson"
-                              disabled=""
-                              style="display: none;"
-                              title="Edit JSON"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-pen"
-                              />
-                            </button>
-                            <button
-                              class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                              disabled=""
-                              style="display: none;"
-                              title="Object Properties"
-                              type="button"
-                            >
-                              <i
-                                class="fas fa-list"
-                              />
-                            </button>
-                          </span>
-                          <div />
-                          <p>
-                            Perform all Quality Assurance (QA) tasks, including file conversion and plotting.
-                          </p>
-                          <div
-                            style="display: none;"
-                          />
-                          <div
-                            class="je-indented-panel"
-                          >
-                            <div>
-                              <div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    class="je-object__container"
-                                    data-schemapath="specification.QA.file_conversion"
-                                    data-schematype="object"
-                                  >
-                                    <span
-                                      class="je-header je-object__title"
-                                    >
-                                      <button
-                                        class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                        title="Collapse"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-caret-down"
-                                        />
-                                      </button>
-                                      <span>
-                                        File Conversion
-                                      </span>
-                                    </span>
-                                    <span
-                                      class="je-object__controls"
-                                    >
-                                      <div
-                                        class="je-modal"
-                                        style="display: none;"
-                                      >
-                                        <label
-                                          for="specification.QA.file_conversion-edit-json-textarea"
-                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                        >
-                                          Edit JSON
-                                        </label>
-                                        <textarea
-                                          aria-labelledby="specification.QA.file_conversion-edit-json-textarea"
-                                          class="je-textarea je-edit-json--textarea"
-                                          id="specification.QA.file_conversion-edit-json-textarea"
-                                        />
-                                        <button
-                                          class="json-editor-btn-save json-editor-btntype-save"
-                                          title="Save"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-save"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-copy json-editor-btntype-copy"
-                                          title="Copy"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-copy"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                          title="Cancel"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-ban"
-                                          />
-                                        </button>
-                                      </div>
-                                      <div
-                                        class="je-modal"
-                                        style="display: none;"
-                                      >
-                                        <div
-                                          class="property-selector"
-                                        />
-                                        <label
-                                          for="specification.QA.file_conversion-property-selector"
-                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                        >
-                                          Properties
-                                        </label>
-                                        <input
-                                          aria-labelledby="specification.QA.file_conversion-property-selector"
-                                          class="property-selector-input"
-                                          id="specification.QA.file_conversion-property-selector"
-                                          placeholder="Property name..."
-                                          type="text"
-                                        />
-                                        <button
-                                          class="json-editor-btn-add json-editor-btntype-add"
-                                          title="Add"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-plus"
-                                          />
-                                        </button>
-                                        <div
-                                          style="clear: both;"
-                                        />
-                                      </div>
-                                      <button
-                                        class="json-editor-btn-edit json-editor-btntype-editjson"
-                                        disabled=""
-                                        style="display: none;"
-                                        title="Edit JSON"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-pen"
-                                        />
-                                      </button>
-                                      <button
-                                        class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                        disabled=""
-                                        style="display: none;"
-                                        title="Object Properties"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-list"
-                                        />
-                                      </button>
-                                    </span>
-                                    <div />
-                                    <p>
-                                      Create a QA file for the observation
-                                    </p>
-                                    <div
-                                      style="display: none;"
-                                    />
-                                    <div
-                                      class="je-indented-panel"
-                                    >
-                                      <div>
-                                        <div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.QA.file_conversion.enabled"
-                                              data-schematype="boolean"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[QA][file_conversion][enabled]"
-                                                >
-                                                  enabled
-                                                </label>
-                                                <select
-                                                  aria-describedby="specification[QA][file_conversion][enabled]-description"
-                                                  disabled=""
-                                                  id="specification[QA][file_conversion][enabled]"
-                                                  name="specification[QA][file_conversion][enabled]"
-                                                >
-                                                  <option
-                                                    value="1"
-                                                  >
-                                                    true
-                                                  </option>
-                                                  <option
-                                                    value=""
-                                                  >
-                                                    false
-                                                  </option>
-                                                </select>
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[QA][file_conversion][enabled]-description"
-                                                >
-                                                  Do/Don't create a QA file for the observation
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.QA.file_conversion.nr_of_subbands"
-                                              data-schematype="integer"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[QA][file_conversion][nr_of_subbands]"
-                                                >
-                                                  #subbands
-                                                </label>
-                                                <input
-                                                  aria-describedby="specification[QA][file_conversion][nr_of_subbands]-description"
-                                                  disabled=""
-                                                  id="specification[QA][file_conversion][nr_of_subbands]"
-                                                  name="specification[QA][file_conversion][nr_of_subbands]"
-                                                  type="text"
-                                                />
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[QA][file_conversion][nr_of_subbands]-description"
-                                                >
-                                                  Keep this number of subbands from the observation in the QA file, or all if -1
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.QA.file_conversion.nr_of_timestamps"
-                                              data-schematype="integer"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[QA][file_conversion][nr_of_timestamps]"
-                                                >
-                                                  #timestamps
-                                                </label>
-                                                <input
-                                                  aria-describedby="specification[QA][file_conversion][nr_of_timestamps]-description"
-                                                  disabled=""
-                                                  id="specification[QA][file_conversion][nr_of_timestamps]"
-                                                  min="1"
-                                                  name="specification[QA][file_conversion][nr_of_timestamps]"
-                                                  type="text"
-                                                />
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[QA][file_conversion][nr_of_timestamps]-description"
-                                                >
-                                                  Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    data-schemapath="specification.QA.inspection_plots"
-                                    data-schematype="string"
-                                  >
-                                    <div
-                                      class="form-control"
-                                    >
-                                      <label
-                                        class="required je-form-input-label"
-                                        for="specification[QA][inspection_plots]"
-                                      >
-                                        Inspection Plots
-                                      </label>
-                                      <select
-                                        disabled=""
-                                        id="specification[QA][inspection_plots]"
-                                        name="specification[QA][inspection_plots]"
-                                      >
-                                        <option
-                                          value="msplots"
-                                        >
-                                          msplots
-                                        </option>
-                                        <option
-                                          value="dynspec"
-                                        >
-                                          dynspec
-                                        </option>
-                                        <option
-                                          value="none"
-                                        >
-                                          none
-                                        </option>
-                                      </select>
-                                    </div>
-                                    <div />
-                                  </div>
-                                </div>
-                                <div
-                                  class="row"
-                                >
-                                  <div
-                                    class="je-object__container"
-                                    data-schemapath="specification.QA.plots"
-                                    data-schematype="object"
-                                  >
-                                    <span
-                                      class="je-header je-object__title"
-                                    >
-                                      <button
-                                        class="json-editor-btn-collapse json-editor-btntype-toggle"
-                                        title="Collapse"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-caret-down"
-                                        />
-                                      </button>
-                                      <span>
-                                        Plots
-                                      </span>
-                                    </span>
-                                    <span
-                                      class="je-object__controls"
-                                    >
-                                      <div
-                                        class="je-modal"
-                                        style="display: none;"
-                                      >
-                                        <label
-                                          for="specification.QA.plots-edit-json-textarea"
-                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                        >
-                                          Edit JSON
-                                        </label>
-                                        <textarea
-                                          aria-labelledby="specification.QA.plots-edit-json-textarea"
-                                          class="je-textarea je-edit-json--textarea"
-                                          id="specification.QA.plots-edit-json-textarea"
-                                        />
-                                        <button
-                                          class="json-editor-btn-save json-editor-btntype-save"
-                                          title="Save"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-save"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-copy json-editor-btntype-copy"
-                                          title="Copy"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-copy"
-                                          />
-                                        </button>
-                                        <button
-                                          class="json-editor-btn-cancel json-editor-btntype-cancel"
-                                          title="Cancel"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-ban"
-                                          />
-                                        </button>
-                                      </div>
-                                      <div
-                                        class="je-modal"
-                                        style="display: none;"
-                                      >
-                                        <div
-                                          class="property-selector"
-                                        />
-                                        <label
-                                          for="specification.QA.plots-property-selector"
-                                          style="position: absolute;width: 1px;height: 1px;padding: 0;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;"
-                                        >
-                                          Properties
-                                        </label>
-                                        <input
-                                          aria-labelledby="specification.QA.plots-property-selector"
-                                          class="property-selector-input"
-                                          id="specification.QA.plots-property-selector"
-                                          placeholder="Property name..."
-                                          type="text"
-                                        />
-                                        <button
-                                          class="json-editor-btn-add json-editor-btntype-add"
-                                          title="Add"
-                                          type="button"
-                                        >
-                                          <i
-                                            class="fas fa-plus"
-                                          />
-                                        </button>
-                                        <div
-                                          style="clear: both;"
-                                        />
-                                      </div>
-                                      <button
-                                        class="json-editor-btn-edit json-editor-btntype-editjson"
-                                        disabled=""
-                                        style="display: none;"
-                                        title="Edit JSON"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-pen"
-                                        />
-                                      </button>
-                                      <button
-                                        class="json-editor-btn-edit_properties json-editor-btntype-properties"
-                                        disabled=""
-                                        style="display: none;"
-                                        title="Object Properties"
-                                        type="button"
-                                      >
-                                        <i
-                                          class="fas fa-list"
-                                        />
-                                      </button>
-                                    </span>
-                                    <div />
-                                    <p>
-                                      Create dynamic spectrum plots
-                                    </p>
-                                    <div
-                                      style="display: none;"
-                                    />
-                                    <div
-                                      class="je-indented-panel"
-                                    >
-                                      <div>
-                                        <div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.QA.plots.autocorrelation"
-                                              data-schematype="boolean"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[QA][plots][autocorrelation]"
-                                                >
-                                                  autocorrelation
-                                                </label>
-                                                <select
-                                                  aria-describedby="specification[QA][plots][autocorrelation]-description"
-                                                  disabled=""
-                                                  id="specification[QA][plots][autocorrelation]"
-                                                  name="specification[QA][plots][autocorrelation]"
-                                                >
-                                                  <option
-                                                    value="1"
-                                                  >
-                                                    true
-                                                  </option>
-                                                  <option
-                                                    value=""
-                                                  >
-                                                    false
-                                                  </option>
-                                                </select>
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[QA][plots][autocorrelation]-description"
-                                                >
-                                                  Create autocorrelation plots for all stations
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.QA.plots.crosscorrelation"
-                                              data-schematype="boolean"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[QA][plots][crosscorrelation]"
-                                                >
-                                                  crosscorrelation
-                                                </label>
-                                                <select
-                                                  aria-describedby="specification[QA][plots][crosscorrelation]-description"
-                                                  disabled=""
-                                                  id="specification[QA][plots][crosscorrelation]"
-                                                  name="specification[QA][plots][crosscorrelation]"
-                                                >
-                                                  <option
-                                                    value="1"
-                                                  >
-                                                    true
-                                                  </option>
-                                                  <option
-                                                    value=""
-                                                  >
-                                                    false
-                                                  </option>
-                                                </select>
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[QA][plots][crosscorrelation]-description"
-                                                >
-                                                  Create crosscorrelation plots for all baselines
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                          <div
-                                            class="row"
-                                          >
-                                            <div
-                                              data-schemapath="specification.QA.plots.enabled"
-                                              data-schematype="boolean"
-                                            >
-                                              <div
-                                                class="form-control"
-                                              >
-                                                <label
-                                                  class="required je-form-input-label"
-                                                  for="specification[QA][plots][enabled]"
-                                                >
-                                                  enabled
-                                                </label>
-                                                <select
-                                                  aria-describedby="specification[QA][plots][enabled]-description"
-                                                  disabled=""
-                                                  id="specification[QA][plots][enabled]"
-                                                  name="specification[QA][plots][enabled]"
-                                                >
-                                                  <option
-                                                    value="1"
-                                                  >
-                                                    true
-                                                  </option>
-                                                  <option
-                                                    value=""
-                                                  >
-                                                    false
-                                                  </option>
-                                                </select>
-                                                <div />
-                                                <p
-                                                  class="je-form-input-label"
-                                                  id="specification[QA][plots][enabled]-description"
-                                                >
-                                                  Do/Don't create plots from the QA file from the observation
-                                                </p>
-                                              </div>
-                                            </div>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="custom-dlg p-grid"
-    data-testid="confirm_dialog"
-    style="opacity: 1;"
-  />
-  <div />
-</DocumentFragment>
-`;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.test.js
index c6782626655d0004220c89c2da7e04e850b21344..f191250211fcefb60dc4523fd5a37890a496fb65 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.test.js
@@ -1494,32 +1494,19 @@ describe('Jeditor', () => {
             await new Promise((r) => setTimeout(r, 5000));
         });
         expect(content.getByText("Task - Details")).toBeInTheDocument();
-        // checking Task details and specification 
         expect(content.getAllByText('Observation').length).toBe(1);
         expect(content.getByText('Observation')).toBeInTheDocument();
 
-        const componentSnapshot = content.asFragment();
-        // Now `page` should be defined
-        expect(componentSnapshot).toMatchSnapshot("Checking Correctness of Custom fields in JEditor using Simple Observation draft");
-
         let freqRes = content.container.querySelector('input[name="specification[correlator][frequency_resolution]"]');
-
-
-                
         expect(freqRes.value).toBe('3.05');
         let timeRes = content.container.querySelector('input[name="specification[correlator][time_resolution]"]');
         expect(timeRes.value).toBe('1');
         let freqSAP = content.container.querySelector('input[name="specification[station_configuration][SAPs][0][frequency]"]');
         expect(freqSAP.value).toBe('99.9-147.6');
-
-
-
         await waitFor(() => expect(content.container.querySelector('input[name="specification[station_configuration][SAPs][0][digital_pointing][angle1]"]')).toBeInTheDocument());
         await waitFor(() => expect(content.container.querySelector('input[name="specification[station_configuration][SAPs][0][digital_pointing][angle2]"]')).toBeInTheDocument());
-
         const angle1El = content.container.querySelector('input[name="specification[station_configuration][SAPs][0][digital_pointing][angle1]"]')
         const angle1E2 =  content.container.querySelector('input[name="specification[station_configuration][SAPs][0][digital_pointing][angle2]"]')
-
         expect(angle1El.value).toBe('03h06m00s');
         expect(angle1E2.value).toBe('89d59m00s');
 
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
index 04b31bcce4716ec517bc20bf25879378939e50df..1e6b2001c731dd658e22ef3dae2733c0c09152c4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
@@ -284,7 +284,7 @@ const ProjectService = {
      */
     getProjectList: async function(fetchQuota, fields) {
       try {
-        const response = await axios.get(`/api/project/?${fields?'fields='+fields:''}${fetchQuota? 'expand=quota': ''}&limit=150`);
+        const response = await axios.get(`/api/project/?${fields?'fields='+fields:''}${fetchQuota? 'expand=quota': ''}&limit=250`);
         return response.data.results;
       } catch (error) {
         console.error('[project.services.getProjectList]',error);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/reservation.list.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/reservation.list.test.js.snap
index 726a959985f549edcfdcfcd8a7b963a8a3b50120..7f5d0c2bf80aa3a76938438a7667371c1161d9c8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/reservation.list.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/reservation.list.test.js.snap
@@ -71,1887 +71,1958 @@ exports[`Reservation List  Reservation List  correctly with data 1`] = `
     </div>
   </div>
   <div
-    class="FilterPanel p-panel p-component"
-    data-pc-name="panel"
-    data-pc-section="root"
-    id="pr_id_12"
+    style="height: calc(100vh - 10.1em); overflow: hidden;"
   >
     <div
-      class="p-panel-header"
-      data-pc-section="header"
-    >
-      <span
-        class="p-panel-title"
-        data-pc-section="title"
-        id="pr_id_12_header"
-      >
-        Special Filters
-      </span>
-      <div
-        class="p-panel-icons"
-        data-pc-section="icons"
-      />
-    </div>
-    <div
-      aria-hidden="false"
-      aria-labelledby="pr_id_12_header"
-      class="p-toggleable-content"
-      data-pc-section="toggleablecontent"
-      id="pr_id_12_content"
-      role="region"
+      class="p-datatable p-component p-datatable-selectable p-datatable-resizable p-datatable-scrollable p-datatable-flex-scrollable p-datatable-responsive-scroll p-datatable-striped p-datatable-gridlines p-datatable-sm"
+      data-pc-name="datatable"
+      data-pc-section="root"
+      data-scrollselectors=".p-datatable-wrapper"
+      data-showgridlines="true"
+      data-testid="viewtable"
+      pr_id_5=""
+      style="width: 100%;"
     >
       <div
-        class="p-panel-content"
-        data-pc-section="content"
+        class="p-datatable-header"
+        data-pc-section="header"
       >
         <div
-          class="divbox"
+          style="display: flex;"
         >
-          <label
-            for="cycle"
-          >
-            Filter by Cycle
-          </label>
-          <div
-            class="ms-width reservationcycledropper p-dropdown p-component p-inputwrapper p-dropdown-clearable"
-            data-p-disabled="false"
-            data-p-focus="false"
-            data-pc-name="dropdown"
+          <button
+            class="p-button p-component p-button-icon-only"
+            data-pc-name="button"
             data-pc-section="root"
-            data-testid="cycle"
-            id="cycle"
           >
-            <div
-              class="p-hidden-accessible"
-              data-pc-section="hiddenselectedmessage"
-            >
-              <input
-                aria-haspopup="listbox"
-                data-pc-section="input"
-                readonly=""
-                tabindex="0"
-                type="text"
-                value=""
-              />
-            </div>
-            <div
-              class="p-hidden-accessible p-dropdown-hidden-select"
-              data-pc-section="hiddenselectedmessage"
-            >
-              <select
-                aria-hidden="true"
-                data-pc-section="select"
-                tabindex="-1"
-              >
-                <option
-                  data-pc-section="option"
-                  selected=""
-                  value=""
-                />
-              </select>
-            </div>
             <span
-              class="p-dropdown-label p-inputtext p-dropdown-label-empty"
-              data-pc-section="input"
-              tabindex="-1"
-            >
-              empty
-            </span>
-            <svg
-              aria-hidden="true"
-              aria-label="Clear"
-              class="p-icon p-dropdown-clear-icon p-clickable"
-              data-pc-section="clearicon"
-              fill="none"
-              height="14"
-              tabindex="0"
-              viewBox="0 0 14 14"
-              width="14"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M8.01186 7.00933L12.27 2.75116C12.341 2.68501 12.398 2.60524 12.4375 2.51661C12.4769 2.42798 12.4982 2.3323 12.4999 2.23529C12.5016 2.13827 12.4838 2.0419 12.4474 1.95194C12.4111 1.86197 12.357 1.78024 12.2884 1.71163C12.2198 1.64302 12.138 1.58893 12.0481 1.55259C11.9581 1.51625 11.8617 1.4984 11.7647 1.50011C11.6677 1.50182 11.572 1.52306 11.4834 1.56255C11.3948 1.60204 11.315 1.65898 11.2488 1.72997L6.99067 5.98814L2.7325 1.72997C2.59553 1.60234 2.41437 1.53286 2.22718 1.53616C2.03999 1.53946 1.8614 1.61529 1.72901 1.74767C1.59663 1.88006 1.5208 2.05865 1.5175 2.24584C1.5142 2.43303 1.58368 2.61419 1.71131 2.75116L5.96948 7.00933L1.71131 11.2675C1.576 11.403 1.5 11.5866 1.5 11.7781C1.5 11.9696 1.576 12.1532 1.71131 12.2887C1.84679 12.424 2.03043 12.5 2.2219 12.5C2.41338 12.5 2.59702 12.424 2.7325 12.2887L6.99067 8.03052L11.2488 12.2887C11.3843 12.424 11.568 12.5 11.7594 12.5C11.9509 12.5 12.1346 12.424 12.27 12.2887C12.4053 12.1532 12.4813 11.9696 12.4813 11.7781C12.4813 11.5866 12.4053 11.403 12.27 11.2675L8.01186 7.00933Z"
-                fill="currentColor"
-              />
-            </svg>
-            <div
-              aria-expanded="false"
-              aria-haspopup="listbox"
-              class="p-dropdown-trigger"
-              data-pc-section="trigger"
-              role="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="p-icon p-dropdown-trigger-icon p-clickable"
-                data-pc-section="dropdownicon"
-                data-pr-overlay-visible="false"
-                fill="none"
-                height="14"
-                viewBox="0 0 14 14"
-                width="14"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
-                  fill="currentColor"
-                />
-              </svg>
-            </div>
-          </div>
-        </div>
-        <div
-          class="divbox"
-        >
-          <label
-            for="fstartdate"
-          >
-            Reserved From
-          </label>
-          <span
-            class="p-calendar p-component p-inputwrapper p-calendar-w-btn p-calendar-w-btn-right"
-            data-pc-name="calendar"
-            data-pc-section="root"
-            id="fstartdate"
-          >
-            <input
-              aria-autocomplete="none"
-              aria-controls="fstartdate_panel"
-              aria-expanded="false"
-              aria-haspopup="dialog"
-              autocomplete="off"
-              class="p-inputtext p-component p-inputtext p-component"
-              data-pc-name="inputtext"
-              data-pc-section="root"
-              inputmode="none"
-              role="combobox"
-              type="text"
+              class="p-button-icon p-c pi pi-wrench"
+              data-pc-section="icon"
             />
-            <button
-              aria-controls="fstartdate_panel"
-              aria-expanded="false"
-              aria-haspopup="dialog"
-              aria-label="Choose Date"
-              class="p-datepicker-trigger p-button p-component p-button-icon-only"
-              data-pc-name="button"
-              data-pc-section="root"
-              tabindex="-1"
-              type="button"
+            <span
+              class="p-button-label p-c"
+              data-pc-section="label"
             >
-              <svg
-                aria-hidden="true"
-                class="p-icon"
-                fill="none"
-                height="14"
-                viewBox="0 0 14 14"
-                width="14"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M10.7838 1.51351H9.83783V0.567568C9.83783 0.417039 9.77804 0.272676 9.6716 0.166237C9.56516 0.0597971 9.42079 0 9.27027 0C9.11974 0 8.97538 0.0597971 8.86894 0.166237C8.7625 0.272676 8.7027 0.417039 8.7027 0.567568V1.51351H5.29729V0.567568C5.29729 0.417039 5.2375 0.272676 5.13106 0.166237C5.02462 0.0597971 4.88025 0 4.72973 0C4.5792 0 4.43484 0.0597971 4.3284 0.166237C4.22196 0.272676 4.16216 0.417039 4.16216 0.567568V1.51351H3.21621C2.66428 1.51351 2.13494 1.73277 1.74467 2.12305C1.35439 2.51333 1.13513 3.04266 1.13513 3.59459V11.9189C1.13513 12.4709 1.35439 13.0002 1.74467 13.3905C2.13494 13.7807 2.66428 14 3.21621 14H10.7838C11.3357 14 11.865 13.7807 12.2553 13.3905C12.6456 13.0002 12.8649 12.4709 12.8649 11.9189V3.59459C12.8649 3.04266 12.6456 2.51333 12.2553 2.12305C11.865 1.73277 11.3357 1.51351 10.7838 1.51351ZM3.21621 2.64865H4.16216V3.59459C4.16216 3.74512 4.22196 3.88949 4.3284 3.99593C4.43484 4.10237 4.5792 4.16216 4.72973 4.16216C4.88025 4.16216 5.02462 4.10237 5.13106 3.99593C5.2375 3.88949 5.29729 3.74512 5.29729 3.59459V2.64865H8.7027V3.59459C8.7027 3.74512 8.7625 3.88949 8.86894 3.99593C8.97538 4.10237 9.11974 4.16216 9.27027 4.16216C9.42079 4.16216 9.56516 4.10237 9.6716 3.99593C9.77804 3.88949 9.83783 3.74512 9.83783 3.59459V2.64865H10.7838C11.0347 2.64865 11.2753 2.74831 11.4527 2.92571C11.6301 3.10311 11.7297 3.34371 11.7297 3.59459V5.67568H2.27027V3.59459C2.27027 3.34371 2.36993 3.10311 2.54733 2.92571C2.72473 2.74831 2.96533 2.64865 3.21621 2.64865ZM10.7838 12.8649H3.21621C2.96533 12.8649 2.72473 12.7652 2.54733 12.5878C2.36993 12.4104 2.27027 12.1698 2.27027 11.9189V6.81081H11.7297V11.9189C11.7297 12.1698 11.6301 12.4104 11.4527 12.5878C11.2753 12.7652 11.0347 12.8649 10.7838 12.8649Z"
-                  fill="currentColor"
-                />
-              </svg>
-              <span
-                class="p-button-label p-c"
-                data-pc-section="label"
-              >
-                 
-              </span>
-            </button>
-          </span>
+               
+            </span>
+          </button>
           <button
-            class="p-button p-component"
+            class="p-button p-component p-button-icon-only p-disabled"
             data-pc-name="button"
             data-pc-section="root"
-            title="Clear date range"
-          >
-              
-            <i
-              class="pi pi-times"
-            />
-               
-          </button>
-        </div>
-        <div
-          class="divbox"
-        >
-          <label
-            for="fenddate"
-          >
-            Reserved To
-          </label>
-          <span
-            class="p-calendar p-component p-inputwrapper p-calendar-w-btn p-calendar-w-btn-right"
-            data-pc-name="calendar"
-            data-pc-section="root"
-            id="fenddate"
+            disabled=""
+            style="margin-left: 5px;"
           >
-            <input
-              aria-autocomplete="none"
-              aria-controls="fenddate_panel"
-              aria-expanded="false"
-              aria-haspopup="dialog"
-              autocomplete="off"
-              class="p-inputtext p-component p-inputtext p-component"
-              data-pc-name="inputtext"
-              data-pc-section="root"
-              inputmode="none"
-              role="combobox"
-              type="text"
+            <span
+              class="p-button-icon p-c pi pi-wave-pulse"
+              data-pc-section="icon"
             />
-            <button
-              aria-controls="fenddate_panel"
-              aria-expanded="false"
-              aria-haspopup="dialog"
-              aria-label="Choose Date"
-              class="p-datepicker-trigger p-button p-component p-button-icon-only"
-              data-pc-name="button"
-              data-pc-section="root"
-              tabindex="-1"
-              type="button"
+            <span
+              class="p-button-label p-c"
+              data-pc-section="label"
             >
-              <svg
-                aria-hidden="true"
-                class="p-icon"
-                fill="none"
-                height="14"
-                viewBox="0 0 14 14"
-                width="14"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M10.7838 1.51351H9.83783V0.567568C9.83783 0.417039 9.77804 0.272676 9.6716 0.166237C9.56516 0.0597971 9.42079 0 9.27027 0C9.11974 0 8.97538 0.0597971 8.86894 0.166237C8.7625 0.272676 8.7027 0.417039 8.7027 0.567568V1.51351H5.29729V0.567568C5.29729 0.417039 5.2375 0.272676 5.13106 0.166237C5.02462 0.0597971 4.88025 0 4.72973 0C4.5792 0 4.43484 0.0597971 4.3284 0.166237C4.22196 0.272676 4.16216 0.417039 4.16216 0.567568V1.51351H3.21621C2.66428 1.51351 2.13494 1.73277 1.74467 2.12305C1.35439 2.51333 1.13513 3.04266 1.13513 3.59459V11.9189C1.13513 12.4709 1.35439 13.0002 1.74467 13.3905C2.13494 13.7807 2.66428 14 3.21621 14H10.7838C11.3357 14 11.865 13.7807 12.2553 13.3905C12.6456 13.0002 12.8649 12.4709 12.8649 11.9189V3.59459C12.8649 3.04266 12.6456 2.51333 12.2553 2.12305C11.865 1.73277 11.3357 1.51351 10.7838 1.51351ZM3.21621 2.64865H4.16216V3.59459C4.16216 3.74512 4.22196 3.88949 4.3284 3.99593C4.43484 4.10237 4.5792 4.16216 4.72973 4.16216C4.88025 4.16216 5.02462 4.10237 5.13106 3.99593C5.2375 3.88949 5.29729 3.74512 5.29729 3.59459V2.64865H8.7027V3.59459C8.7027 3.74512 8.7625 3.88949 8.86894 3.99593C8.97538 4.10237 9.11974 4.16216 9.27027 4.16216C9.42079 4.16216 9.56516 4.10237 9.6716 3.99593C9.77804 3.88949 9.83783 3.74512 9.83783 3.59459V2.64865H10.7838C11.0347 2.64865 11.2753 2.74831 11.4527 2.92571C11.6301 3.10311 11.7297 3.34371 11.7297 3.59459V5.67568H2.27027V3.59459C2.27027 3.34371 2.36993 3.10311 2.54733 2.92571C2.72473 2.74831 2.96533 2.64865 3.21621 2.64865ZM10.7838 12.8649H3.21621C2.96533 12.8649 2.72473 12.7652 2.54733 12.5878C2.36993 12.4104 2.27027 12.1698 2.27027 11.9189V6.81081H11.7297V11.9189C11.7297 12.1698 11.6301 12.4104 11.4527 12.5878C11.2753 12.7652 11.0347 12.8649 10.7838 12.8649Z"
-                  fill="currentColor"
-                />
-              </svg>
-              <span
-                class="p-button-label p-c"
-                data-pc-section="label"
-              >
-                 
-              </span>
-            </button>
-          </span>
+               
+            </span>
+          </button>
           <button
-            class="p-button p-component"
+            class="p-button p-component p-button-icon-only"
             data-pc-name="button"
             data-pc-section="root"
-            title="Clear date range"
+            style="margin-left: 5px;"
           >
-             
-            <i
-              class="pi pi-times"
+            <span
+              class="p-button-icon p-c pi pi-filter-slash"
+              data-pc-section="icon"
             />
-              
+            <span
+              class="p-button-label p-c"
+              data-pc-section="label"
+            >
+               
+            </span>
           </button>
         </div>
       </div>
-    </div>
-  </div>
-  <div>
-    <div
-      style="display: flex; justify-content: space-between; height: 35px;"
-    >
-      <div
-        id="block_container"
-      >
-        <div
-          style="text-align: left; margin-right: 30px;"
-          title="Toggle Columns"
-        >
-          <i
-            class="fa fa-columns col-filter-btn"
-            label="Toggle Columns"
-          />
-          <div
-            style="position: relative; top: -25px; margin-left: 50px; color: rgb(0, 91, 159);"
-          >
-            <i
-              class="fas fa-sync-alt"
-              title="Clear All Filters"
-            />
-          </div>
-        </div>
-        <div
-          style="text-align: right;"
-        >
-          <span
-            style="margin-left: -10px;"
-          >
-            <input
-              value=""
-            />
-              
-            <i
-              class="fa fa-search"
-            />
-          </span>
-        </div>
-        <div
-          class="total_records_top_label"
-        >
-           
-          <label>
-            Total records (9090)
-          </label>
-        </div>
-      </div>
       <div
-        class="total_records_top_label"
-        style="margin-top: 3px; margin-right: 5px;"
+        class="p-datatable-wrapper"
+        data-pc-section="wrapper"
+        style="overflow: auto; max-height: flex;"
       >
-        <a
-          href="#"
-          style="vertical-align: middle;"
-          title="Download CSV"
+        <table
+          class="p-datatable-table p-datatable-scrollable-table p-datatable-resizable-table"
+          data-pc-section="table"
+          role="table"
+          style="min-width: 60rem;"
         >
-          <i
-            class="fas fa-file-csv"
-            style="color: green; font-size: 20px;"
-          />
-        </a>
-      </div>
-    </div>
-    <div
-      class="tmss-table table_container"
-    >
-      <table
-        class="viewtable"
-        data-testid="viewtable"
-        role="table"
-        style="min-width: 1260px;"
-      >
-        <thead>
-          <tr
-            data-testid="tablerows"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+          <thead
+            class="p-datatable-thead"
+            data-pc-name="datatable"
+            data-pc-section="thead"
+            role="rowgroup"
           >
-            <th
-              class="fixed-column-td"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+            <tr
+              data-pc-section="headerrow"
+              role="row"
+            >
+              <th
+                class="p-filter-column p-resizable-column p-frozen-column p-selection-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="true"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 40px; max-width: 40px; left: 0px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
-                  >
-                    <div
-                      class="fixed-column"
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
-                    >
-                      <div
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Select"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                      >
-                        <div>
-                          <input
-                            style="width: 15px; height: 15px;"
-                            title="Toggle All Rows Selected"
-                            type="checkbox"
-                          />
-                        </div>
-                      </div>
-                    </div>
-                    <div />
-                  </div>
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  />
                 </div>
-              </div>
-            </th>
-            <th
-              class="fixed-column-td"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-frozen-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="true"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 40px; text-align: center; max-width: 40px; left: 0px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  />
+                </div>
+              </th>
+              <th
+                aria-sort="none"
+                class="p-filter-column p-sortable-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="true"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 140px;"
+                tabindex="0"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
                   >
-                    <div
-                      class="fixed-column"
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                    Id
+                  </span>
+                  <span
+                    data-pc-section="sort"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon p-sortable-column-icon"
+                      data-pc-section="sorticon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <div
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Action"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                      >
-                        Action
-                      </div>
-                    </div>
-                    <div />
-                  </div>
+                      <path
+                        d="M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.4413 14 10.2697 13.9368 10.1342 13.8013L7.87611 11.5432C7.61418 11.2813 7.61418 10.8477 7.87611 10.5858C8.13805 10.3239 8.5716 10.3239 8.83353 10.5858L10.6129 12.3652L12.3922 10.5858C12.6542 10.3239 13.0877 10.3239 13.3497 10.5858C13.6116 10.8477 13.6116 11.2813 13.3497 11.5432L11.0916 13.8013C10.9561 13.9368 10.7845 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </span>
                 </div>
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-SystemId"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                aria-sort="none"
+                class="p-filter-column p-sortable-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="true"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+                tabindex="0"
               >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
+                    Name
+                  </span>
+                  <span
+                    data-pc-section="sort"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon p-sortable-column-icon"
+                      data-pc-section="sorticon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="System Id"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="System Id"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        System Id
-                        <i
-                          aria-hidden="true"
-                          class="pi pi-sort-up"
-                        />
-                      </div>
-                    </div>
-                    <div>
-                      <div
-                        class="table-filter"
-                        style="margin-right: 5px;"
-                      >
-                        <input
-                          title="Enter few characters and press ‘Enter’ key to search"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                  </div>
+                      <path
+                        d="M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.4413 14 10.2697 13.9368 10.1342 13.8013L7.87611 11.5432C7.61418 11.2813 7.61418 10.8477 7.87611 10.5858C8.13805 10.3239 8.5716 10.3239 8.83353 10.5858L10.6129 12.3652L12.3922 10.5858C12.6542 10.3239 13.0877 10.3239 13.3497 10.5858C13.6116 10.8477 13.6116 11.2813 13.3497 11.5432L11.0916 13.8013C10.9561 13.9368 10.7845 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </span>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 140px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
                 />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Description"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Cycle
+                  </span>
+                </div>
+              </th>
+              <th
+                aria-sort="none"
+                class="p-filter-column p-sortable-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="true"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 140px;"
+                tabindex="0"
               >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
+                    Description
+                  </span>
+                  <span
+                    data-pc-section="sort"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon p-sortable-column-icon"
+                      data-pc-section="sorticon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Description"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Description"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        Description
-                      </div>
-                    </div>
-                    <div>
-                      <div
-                        class="table-filter"
-                        style="margin-right: 5px;"
-                      >
-                        <input
-                          title="Enter few characters and press ‘Enter’ key to search"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                  </div>
+                      <path
+                        d="M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.4413 14 10.2697 13.9368 10.1342 13.8013L7.87611 11.5432C7.61418 11.2813 7.61418 10.8477 7.87611 10.5858C8.13805 10.3239 8.5716 10.3239 8.83353 10.5858L10.6129 12.3652L12.3922 10.5858C12.6542 10.3239 13.0877 10.3239 13.3497 10.5858C13.6116 10.8477 13.6116 11.2813 13.3497 11.5432L11.0916 13.8013C10.9561 13.9368 10.7845 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </span>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-StartTime"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                aria-sort="none"
+                class="p-filter-column p-sortable-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="true"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+                tabindex="0"
               >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
+                    Start Time
+                  </span>
+                  <span
+                    data-pc-section="sort"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon p-sortable-column-icon"
+                      data-pc-section="sorticon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Start Time"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Start Time"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        Start Time
-                      </div>
-                    </div>
-                    <div>
-                      <div
-                        class="table-filter"
-                      >
-                        <div
-                          class="flatpickr-range-filter"
-                          data-enable-time="true"
-                          data-input="true"
-                          title="Enter the date & time range to search and press ‘Ok’ button"
-                        >
-                          <input
-                            class="p-inputtext p-component calendar-input flatpickr-input"
-                            data-input="true"
-                            type="text"
-                          />
-                          <button
-                            class="p-button p-component p-button-icon-only calendar-button"
-                            data-toggle="true"
-                            title="Click to select the date range"
-                          >
-                            <i
-                              class="fas fa-calendar"
-                            />
-                          </button>
-                          <button
-                            class="p-button p-component p-button-icon-only calendar-reset"
-                            title="Clear date range"
-                          >
-                            <i
-                              class="pi pi-times"
-                              style="color: white;"
-                            />
-                          </button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+                      <path
+                        d="M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.4413 14 10.2697 13.9368 10.1342 13.8013L7.87611 11.5432C7.61418 11.2813 7.61418 10.8477 7.87611 10.5858C8.13805 10.3239 8.5716 10.3239 8.83353 10.5858L10.6129 12.3652L12.3922 10.5858C12.6542 10.3239 13.0877 10.3239 13.3497 10.5858C13.6116 10.8477 13.6116 11.2813 13.3497 11.5432L11.0916 13.8013C10.9561 13.9368 10.7845 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </span>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-EndTime"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                aria-sort="none"
+                class="p-filter-column p-sortable-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="true"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+                tabindex="0"
               >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
+                    End Time
+                  </span>
+                  <span
+                    data-pc-section="sort"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon p-sortable-column-icon"
+                      data-pc-section="sorticon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="End Time"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="End Time"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        End Time
-                      </div>
-                    </div>
-                    <div>
-                      <div
-                        class="table-filter"
-                      >
-                        <div
-                          class="flatpickr-range-filter"
-                          data-enable-time="true"
-                          data-input="true"
-                          title="Enter the date & time range to search and press ‘Ok’ button"
-                        >
-                          <input
-                            class="p-inputtext p-component calendar-input flatpickr-input"
-                            data-input="true"
-                            type="text"
-                          />
-                          <button
-                            class="p-button p-component p-button-icon-only calendar-button"
-                            data-toggle="true"
-                            title="Click to select the date range"
-                          >
-                            <i
-                              class="fas fa-calendar"
-                            />
-                          </button>
-                          <button
-                            class="p-button p-component p-button-icon-only calendar-reset"
-                            title="Clear date range"
-                          >
-                            <i
-                              class="pi pi-times"
-                              style="color: white;"
-                            />
-                          </button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+                      <path
+                        d="M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.4413 14 10.2697 13.9368 10.1342 13.8013L7.87611 11.5432C7.61418 11.2813 7.61418 10.8477 7.87611 10.5858C8.13805 10.3239 8.5716 10.3239 8.83353 10.5858L10.6129 12.3652L12.3922 10.5858C12.6542 10.3239 13.0877 10.3239 13.3497 10.5858C13.6116 10.8477 13.6116 11.2813 13.3497 11.5432L11.0916 13.8013C10.9561 13.9368 10.7845 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                      <path
+                        d="M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </span>
                 </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
                 <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Duration (Days HH:mm:ss)
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
                 />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
-              >
                 <div
-                  style="display: flex;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
                 >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
-                    >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Duration (Days HH:mm:ss)"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Duration (Days HH:mm:ss)"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        Duration (Days HH:mm:ss)
-                      </div>
-                    </div>
-                    <div>
-                      <div
-                        style="align-items: center;"
-                      >
-                        <div>
-                          <div>
-                            <div
-                              class="p-dropdown p-component p-inputwrapper p-dropdown-clearable p-inputwrapper-filled"
-                              data-p-disabled="false"
-                              data-p-focus="false"
-                              data-pc-name="dropdown"
-                              data-pc-section="root"
-                              style="width: 10em;"
-                            >
-                              <div
-                                class="p-hidden-accessible"
-                                data-pc-section="hiddenselectedmessage"
-                              >
-                                <input
-                                  aria-haspopup="listbox"
-                                  data-pc-section="input"
-                                  readonly=""
-                                  tabindex="0"
-                                  type="text"
-                                  value="All"
-                                />
-                              </div>
-                              <div
-                                class="p-hidden-accessible p-dropdown-hidden-select"
-                                data-pc-section="hiddenselectedmessage"
-                              >
-                                <select
-                                  aria-hidden="true"
-                                  data-pc-section="select"
-                                  tabindex="-1"
-                                >
-                                  <option
-                                    data-pc-section="option"
-                                    selected=""
-                                    value="All"
-                                  >
-                                    All
-                                  </option>
-                                </select>
-                              </div>
-                              <span
-                                class="p-dropdown-label p-inputtext"
-                                data-pc-section="input"
-                                tabindex="-1"
-                              >
-                                All
-                              </span>
-                              <svg
-                                aria-hidden="true"
-                                aria-label="Clear"
-                                class="p-icon p-dropdown-clear-icon p-clickable"
-                                data-pc-section="clearicon"
-                                fill="none"
-                                height="14"
-                                tabindex="0"
-                                viewBox="0 0 14 14"
-                                width="14"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8.01186 7.00933L12.27 2.75116C12.341 2.68501 12.398 2.60524 12.4375 2.51661C12.4769 2.42798 12.4982 2.3323 12.4999 2.23529C12.5016 2.13827 12.4838 2.0419 12.4474 1.95194C12.4111 1.86197 12.357 1.78024 12.2884 1.71163C12.2198 1.64302 12.138 1.58893 12.0481 1.55259C11.9581 1.51625 11.8617 1.4984 11.7647 1.50011C11.6677 1.50182 11.572 1.52306 11.4834 1.56255C11.3948 1.60204 11.315 1.65898 11.2488 1.72997L6.99067 5.98814L2.7325 1.72997C2.59553 1.60234 2.41437 1.53286 2.22718 1.53616C2.03999 1.53946 1.8614 1.61529 1.72901 1.74767C1.59663 1.88006 1.5208 2.05865 1.5175 2.24584C1.5142 2.43303 1.58368 2.61419 1.71131 2.75116L5.96948 7.00933L1.71131 11.2675C1.576 11.403 1.5 11.5866 1.5 11.7781C1.5 11.9696 1.576 12.1532 1.71131 12.2887C1.84679 12.424 2.03043 12.5 2.2219 12.5C2.41338 12.5 2.59702 12.424 2.7325 12.2887L6.99067 8.03052L11.2488 12.2887C11.3843 12.424 11.568 12.5 11.7594 12.5C11.9509 12.5 12.1346 12.424 12.27 12.2887C12.4053 12.1532 12.4813 11.9696 12.4813 11.7781C12.4813 11.5866 12.4053 11.403 12.27 11.2675L8.01186 7.00933Z"
-                                  fill="currentColor"
-                                />
-                              </svg>
-                              <div
-                                aria-expanded="false"
-                                aria-haspopup="listbox"
-                                class="p-dropdown-trigger"
-                                data-pc-section="trigger"
-                                role="button"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="p-icon p-dropdown-trigger-icon p-clickable"
-                                  data-pc-section="dropdownicon"
-                                  data-pr-overlay-visible="false"
-                                  fill="none"
-                                  height="14"
-                                  viewBox="0 0 14 14"
-                                  width="14"
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <path
-                                    d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
-                                    fill="currentColor"
-                                  />
-                                </svg>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+                    Reservation Type
+                  </span>
                 </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 100px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
                 <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Subject
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 75px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
                 />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-ReservationType"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Planned
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Stations
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Fixed Time
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 75px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Dynamic
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 75px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Fixed project
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Projects
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 75px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Expert
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 75px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    HBA-RFI
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 75px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    LBA-RFI
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Created at
+                  </span>
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-resizable-column p-reorderable-column"
+                data-p-filter-column="true"
+                data-p-frozen-column="false"
+                data-p-reorderable-column="true"
+                data-p-resizable-column="true"
+                data-p-sortable-column="false"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                role="columnheader"
+                style="min-width: 180px;"
+              >
+                <span
+                  class="p-column-resizer"
+                  data-pc-section="columnresizer"
+                />
+                <div
+                  class="p-column-header-content"
+                  data-pc-section="headercontent"
+                >
+                  <span
+                    class="p-column-title"
+                    data-pc-section="headertitle"
+                  >
+                    Updated at
+                  </span>
+                </div>
+              </th>
+            </tr>
+            <tr
+              data-pc-section="headerrow"
+              role="row"
+            >
+              <th
+                class="p-filter-column p-frozen-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="left: 0px;"
+              >
+                <div
+                  aria-checked="false"
+                  aria-label="All items unselected"
+                  class="p-checkbox p-component p-disabled"
+                  data-p-disabled="true"
+                  data-p-highlight="false"
+                  data-pc-name="checkbox"
+                  data-pc-section="root"
+                  role="checkbox"
+                >
+                  <input
+                    aria-checked="false"
+                    aria-invalid="false"
+                    aria-label="All items unselected"
+                    class="p-checkbox-input"
+                    data-pc-section="input"
+                    disabled=""
+                    type="checkbox"
+                  />
+                  <div
+                    class="p-checkbox-box"
+                    data-p-disabled="true"
+                    data-p-highlight="false"
+                    data-pc-section="box"
+                  />
+                </div>
+              </th>
+              <th
+                class="p-filter-column p-frozen-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="left: 0px;"
+              />
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 140px;"
+              >
+                <div
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
+                >
+                  <div
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
+                  >
+                    <input
+                      aria-label="Id"
+                      class="p-column-filter p-inputtext p-component"
+                      data-pc-name="inputtext"
+                      data-pc-section="root"
+                      placeholder="Id"
+                      type="text"
+                      value=""
+                    />
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
+              >
+                <div
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
+                >
+                  <div
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
+                  >
+                    <input
+                      aria-label="Name"
+                      class="p-column-filter p-inputtext p-component"
+                      data-pc-name="inputtext"
+                      data-pc-section="root"
+                      placeholder="Name"
+                      type="text"
+                      value=""
+                    />
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 140px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                      class="p-column-filter p-dropdown p-component p-inputwrapper p-dropdown-clearable"
+                      data-p-disabled="false"
+                      data-p-focus="false"
+                      data-pc-name="dropdown"
+                      data-pc-section="root"
                     >
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Reservation Type"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Reservation Type"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
+                        class="p-hidden-accessible"
+                        data-pc-section="hiddenselectedmessage"
                       >
-                        Reservation Type
+                        <input
+                          aria-haspopup="listbox"
+                          data-pc-section="input"
+                          readonly=""
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
                       </div>
-                    </div>
-                    <div>
-                      <div>
+                      <div
+                        class="p-hidden-accessible p-dropdown-hidden-select"
+                        data-pc-section="hiddenselectedmessage"
+                      >
                         <select
-                          style="height: 24.2014px; border: 1px solid lightgrey;"
-                          title="Select a value from list to search"
+                          aria-hidden="true"
+                          data-pc-section="select"
+                          tabindex="-1"
                         >
                           <option
+                            data-pc-section="option"
+                            selected=""
                             value=""
                           >
-                            All
-                          </option>
-                          <option
-                            value="maintenance"
-                          >
-                            Maintenance
-                          </option>
-                          <option
-                            value="test"
-                          >
-                            Test
-                          </option>
-                          <option
-                            value="upgrade"
-                          >
-                            Upgrade
-                          </option>
-                          <option
-                            value="outage"
-                          >
-                            Outage
-                          </option>
-                          <option
-                            value="pr"
-                          >
-                            Pr
-                          </option>
-                          <option
-                            value="stand-alone mode"
-                          >
-                            Stand Alone Mode
-                          </option>
-                          <option
-                            value="test system"
-                          >
-                            Test System
-                          </option>
-                          <option
-                            value="other"
-                          >
-                            Other
-                          </option>
-                          <option
-                            value="mowing"
-                          >
-                            Mowing
-                          </option>
-                          <option
-                            value="stopday"
-                          >
-                            Stopday
-                          </option>
-                          <option
-                            value="software rollout"
-                          >
-                            Software Rollout
-                          </option>
-                          <option
-                            value="windmill standstill"
-                          >
-                            Windmill Standstill
+                            Cycle
                           </option>
                         </select>
                       </div>
+                      <span
+                        class="p-dropdown-label p-inputtext p-placeholder"
+                        data-pc-section="input"
+                        tabindex="-1"
+                      >
+                        Cycle
+                      </span>
+                      <div
+                        aria-expanded="false"
+                        aria-haspopup="listbox"
+                        aria-label="Cycle"
+                        class="p-dropdown-trigger"
+                        data-pc-section="trigger"
+                        role="button"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="p-icon p-dropdown-trigger-icon p-clickable"
+                          data-pc-section="dropdownicon"
+                          data-pr-overlay-visible="false"
+                          fill="none"
+                          height="14"
+                          viewBox="0 0 14 14"
+                          width="14"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </div>
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 140px;"
+              >
                 <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Subject"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
+                >
+                  <div
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
+                  >
+                    <input
+                      aria-label="Description"
+                      class="p-column-filter p-inputtext p-component"
+                      data-pc-name="inputtext"
+                      data-pc-section="root"
+                      placeholder="Description"
+                      type="text"
+                      value=""
+                    />
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                    <span
+                      class="p-calendar p-component p-inputwrapper"
+                      data-pc-name="calendar"
+                      data-pc-section="root"
+                      id="calendar-24h"
                     >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Subject"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Subject"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        Subject
-                      </div>
-                    </div>
-                    <div>
-                      <div>
-                        <select
-                          style="height: 24.2014px; border: 1px solid lightgrey;"
-                          title="Select a value from list to search"
-                        >
-                          <option
-                            value=""
-                          >
-                            All
-                          </option>
-                          <option
-                            value="environment"
-                          >
-                            Environment
-                          </option>
-                          <option
-                            value="hardware"
-                          >
-                            Hardware
-                          </option>
-                          <option
-                            value="firmware"
-                          >
-                            Firmware
-                          </option>
-                          <option
-                            value="software"
-                          >
-                            Software
-                          </option>
-                          <option
-                            value="system"
-                          >
-                            System
-                          </option>
-                          <option
-                            value="network"
-                          >
-                            Network
-                          </option>
-                          <option
-                            value="nothing"
-                          >
-                            Nothing
-                          </option>
-                        </select>
-                      </div>
-                    </div>
+                      <input
+                        aria-autocomplete="none"
+                        aria-controls="calendar-24h_panel"
+                        aria-expanded="false"
+                        aria-haspopup="dialog"
+                        autocomplete="off"
+                        class="p-inputtext p-component p-inputtext p-component"
+                        data-pc-name="inputtext"
+                        data-pc-section="root"
+                        inputmode="none"
+                        role="combobox"
+                        type="text"
+                      />
+                    </span>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
+              >
                 <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Planned"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
+                >
+                  <div
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
+                  >
+                    <span
+                      class="p-calendar p-component p-inputwrapper"
+                      data-pc-name="calendar"
+                      data-pc-section="root"
+                      id="calendar-24h"
+                    >
+                      <input
+                        aria-autocomplete="none"
+                        aria-controls="calendar-24h_panel"
+                        aria-expanded="false"
+                        aria-haspopup="dialog"
+                        autocomplete="off"
+                        class="p-inputtext p-component p-inputtext p-component"
+                        data-pc-name="inputtext"
+                        data-pc-section="root"
+                        inputmode="none"
+                        role="combobox"
+                        type="text"
+                      />
+                    </span>
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
+              />
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                      class="p-column-filter p-dropdown p-component p-inputwrapper p-dropdown-clearable"
+                      data-p-disabled="false"
+                      data-p-focus="false"
+                      data-pc-name="dropdown"
+                      data-pc-section="root"
                     >
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Planned"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Planned"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
+                        class="p-hidden-accessible"
+                        data-pc-section="hiddenselectedmessage"
                       >
-                        Planned
+                        <input
+                          aria-haspopup="listbox"
+                          data-pc-section="input"
+                          readonly=""
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
                       </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
-                          data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
+                      <div
+                        class="p-hidden-accessible p-dropdown-hidden-select"
+                        data-pc-section="hiddenselectedmessage"
+                      >
+                        <select
+                          aria-hidden="true"
+                          data-pc-section="select"
+                          tabindex="-1"
                         >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
+                          <option
+                            data-pc-section="option"
+                            selected=""
                             value=""
-                          />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
                           >
-                            Not Selected
-                          </span>
-                          <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
+                            Reservation Type
+                          </option>
+                        </select>
+                      </div>
+                      <span
+                        class="p-dropdown-label p-inputtext p-placeholder"
+                        data-pc-section="input"
+                        tabindex="-1"
+                      >
+                        Reservation Type
+                      </span>
+                      <div
+                        aria-expanded="false"
+                        aria-haspopup="listbox"
+                        aria-label="Reservation Type"
+                        class="p-dropdown-trigger"
+                        data-pc-section="trigger"
+                        role="button"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="p-icon p-dropdown-trigger-icon p-clickable"
+                          data-pc-section="dropdownicon"
+                          data-pr-overlay-visible="false"
+                          fill="none"
+                          height="14"
+                          viewBox="0 0 14 14"
+                          width="14"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
+                            fill="currentColor"
                           />
-                        </div>
+                        </svg>
                       </div>
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Stations"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 100px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
+                      class="p-column-filter p-dropdown p-component p-inputwrapper p-dropdown-clearable"
+                      data-p-disabled="false"
+                      data-p-focus="false"
+                      data-pc-name="dropdown"
+                      data-pc-section="root"
                     >
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Stations"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Stations"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
+                        class="p-hidden-accessible"
+                        data-pc-section="hiddenselectedmessage"
                       >
-                        Stations
+                        <input
+                          aria-haspopup="listbox"
+                          data-pc-section="input"
+                          readonly=""
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
                       </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="flex "
-                        >
-                          <div
-                            class="p-field-radiobutton"
-                            style="margin-right: 5px;"
-                          >
-                            <div
-                              class="p-radiobutton p-component p-highlight"
-                              data-p-checked="true"
-                              data-pc-name="radiobutton"
-                              data-pc-section="root"
-                            >
-                              <input
-                                checked=""
-                                class="p-radiobutton-input"
-                                data-pc-section="input"
-                                id="filtertype1"
-                                name="filtertype"
-                                type="radio"
-                              />
-                              <div
-                                class="p-radiobutton-box"
-                                data-pc-section="box"
-                              >
-                                <div
-                                  class="p-radiobutton-icon"
-                                  data-pc-section="icon"
-                                />
-                              </div>
-                            </div>
-                            <label
-                              for="filtertype1"
-                            >
-                              Any
-                            </label>
-                          </div>
-                          <div
-                            class="p-field-radiobutton"
-                          >
-                            <div
-                              class="p-radiobutton p-component"
-                              data-p-checked="false"
-                              data-pc-name="radiobutton"
-                              data-pc-section="root"
-                              style="vertical-align: top;"
-                            >
-                              <input
-                                class="p-radiobutton-input"
-                                data-pc-section="input"
-                                id="filtertype2"
-                                name="filtertype"
-                                type="radio"
-                              />
-                              <div
-                                class="p-radiobutton-box"
-                                data-pc-section="box"
-                              >
-                                <div
-                                  class="p-radiobutton-icon"
-                                  data-pc-section="icon"
-                                />
-                              </div>
-                            </div>
-                            <label
-                              for="filtertype2"
-                            >
-                              All
-                            </label>
-                          </div>
-                        </div>
-                        <div
-                          style="position: relative; display: flex;"
+                      <div
+                        class="p-hidden-accessible p-dropdown-hidden-select"
+                        data-pc-section="hiddenselectedmessage"
+                      >
+                        <select
+                          aria-hidden="true"
+                          data-pc-section="select"
+                          tabindex="-1"
                         >
-                          <div
-                            class="multi-select p-multiselect p-component p-inputwrapper"
-                            data-pc-name="multiselect"
-                            data-pc-section="root"
-                            data-testid="multi-select"
-                            id="multi-select"
-                            style="width: 95%;"
-                          >
-                            <div
-                              class="p-hidden-accessible"
-                              data-p-hidden-accessible="true"
-                              data-pc-section="hiddeninputwrapper"
-                            >
-                              <input
-                                aria-expanded="false"
-                                data-pc-section="input"
-                                readonly=""
-                                role="combobox"
-                                tabindex="0"
-                                type="text"
-                              />
-                            </div>
-                            <div
-                              class="p-multiselect-label-container"
-                              data-pc-section="labelcontainer"
-                            >
-                              <div
-                                class="p-multiselect-label p-multiselect-label-empty"
-                                data-pc-section="label"
-                              >
-                                empty
-                              </div>
-                            </div>
-                            <div
-                              class="p-multiselect-trigger"
-                              data-pc-section="trigger"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="p-icon p-multiselect-trigger-icon p-c"
-                                data-pc-section="triggericon"
-                                fill="none"
-                                height="14"
-                                viewBox="0 0 14 14"
-                                width="14"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
-                                  fill="currentColor"
-                                />
-                              </svg>
-                            </div>
-                          </div>
-                          <button
-                            class="p-link"
+                          <option
+                            data-pc-section="option"
+                            selected=""
+                            value=""
                           >
-                            <i
-                              class="pi pi-search search-btn"
-                            />
-                          </button>
-                        </div>
+                            Subject
+                          </option>
+                        </select>
                       </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-FixedTime"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
-              >
-                <div
-                  style="display: flex;"
-                >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
-                  >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
-                    >
+                      <span
+                        class="p-dropdown-label p-inputtext p-placeholder"
+                        data-pc-section="input"
+                        tabindex="-1"
+                      >
+                        Subject
+                      </span>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="FixedTime"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="FixedTime"
-                        draggable="false"
+                        aria-expanded="false"
+                        aria-haspopup="listbox"
+                        aria-label="Subject"
+                        class="p-dropdown-trigger"
+                        data-pc-section="trigger"
                         role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
                       >
-                        FixedTime
-                      </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
-                          data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
+                        <svg
+                          aria-hidden="true"
+                          class="p-icon p-dropdown-trigger-icon p-clickable"
+                          data-pc-section="dropdownicon"
+                          data-pr-overlay-visible="false"
+                          fill="none"
+                          height="14"
+                          viewBox="0 0 14 14"
+                          width="14"
+                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
-                            value=""
+                          <path
+                            d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
+                            fill="currentColor"
                           />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
-                          >
-                            Not Selected
-                          </span>
-                          <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
-                          />
-                        </div>
+                        </svg>
                       </div>
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Dynamic"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 75px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
                     >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Dynamic"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Dynamic"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
                         tabindex="0"
-                      >
-                        Dynamic
-                      </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
-                          data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
-                        >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
-                            value=""
-                          />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
-                          >
-                            Not Selected
-                          </span>
-                          <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
-                          />
-                        </div>
-                      </div>
+                      />
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Fixedproject"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
-                    >
+                    <div>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Fixed project"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Fixed project"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
+                        style="position: relative; display: flex;"
                       >
-                        Fixed project
-                      </div>
-                    </div>
-                    <div>
-                      <div>
                         <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
+                          class="p-multiselect p-component p-inputwrapper"
+                          data-pc-name="multiselect"
                           data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
+                          data-testid="multi-select"
+                          id="multi-select"
                         >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
-                            value=""
-                          />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
+                          <div
+                            class="p-hidden-accessible"
+                            data-p-hidden-accessible="true"
+                            data-pc-section="hiddeninputwrapper"
                           >
-                            Not Selected
-                          </span>
+                            <input
+                              aria-expanded="false"
+                              data-pc-section="input"
+                              readonly=""
+                              role="combobox"
+                              tabindex="0"
+                              type="text"
+                            />
+                          </div>
                           <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
-                          />
+                            class="p-multiselect-label-container"
+                            data-pc-section="labelcontainer"
+                          >
+                            <div
+                              class="p-multiselect-label p-multiselect-label-empty"
+                              data-pc-section="label"
+                            >
+                              empty
+                            </div>
+                          </div>
+                          <div
+                            class="p-multiselect-trigger"
+                            data-pc-section="trigger"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="p-icon p-multiselect-trigger-icon p-c"
+                              data-pc-section="triggericon"
+                              fill="none"
+                              height="14"
+                              viewBox="0 0 14 14"
+                              width="14"
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
+                                fill="currentColor"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Projects"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
-              >
-                <div
-                  style="display: flex;"
-                >
-                  <div
-                    style="display: grid; vertical-align: bottom;"
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Projects"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Projects"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        Projects
-                      </div>
-                    </div>
-                    <div />
-                  </div>
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Expert"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
                     >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Expert"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Expert"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
                         tabindex="0"
-                      >
-                        Expert
-                      </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
-                          data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
-                        >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
-                            value=""
-                          />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
-                          >
-                            Not Selected
-                          </span>
-                          <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
-                          />
-                        </div>
-                      </div>
+                      />
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-HBA-RFI"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 75px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
                     >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="HBA-RFI"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="HBA-RFI"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
                         tabindex="0"
-                      >
-                        HBA-RFI
-                      </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
-                          data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
-                        >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
-                            value=""
-                          />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
-                          >
-                            Not Selected
-                          </span>
-                          <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
-                          />
-                        </div>
-                      </div>
+                      />
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-LBA-RFI"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 75px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
                     >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="LBA-RFI"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="LBA-RFI"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
                         tabindex="0"
-                      >
-                        LBA-RFI
-                      </div>
-                    </div>
-                    <div>
-                      <div>
-                        <div
-                          class="p-tristatecheckbox p-checkbox p-component"
-                          data-p-disabled="false"
-                          data-pc-name="tristatecheckbox"
-                          data-pc-section="root"
-                          style="width: 15px; height: 24.2014px;"
-                        >
-                          <input
-                            aria-invalid="false"
-                            class="p-checkbox-input"
-                            data-pc-section="input"
-                            type="checkbox"
-                            value=""
-                          />
-                          <span
-                            aria-live="polite"
-                            class="p-sr-only p-hidden-accessible"
-                            data-pc-section="sronlyaria"
-                          >
-                            Not Selected
-                          </span>
-                          <div
-                            aria-checked="false"
-                            class="p-checkbox-box"
-                            data-pc-section="box"
-                            role="checkbox"
-                            tabindex="0"
-                          />
-                        </div>
-                      </div>
+                      />
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Createdat"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
-                    <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
-                    >
-                      <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Created at"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Created at"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
-                        tabindex="0"
-                      >
-                        Created at
-                      </div>
-                    </div>
                     <div>
                       <div
-                        class="table-filter"
+                        style="position: relative; display: flex;"
                       >
-                        <span
-                          class="p-calendar p-component p-inputwrapper p-calendar-w-btn p-calendar-w-btn-right"
-                          data-pc-name="calendar"
+                        <div
+                          class="p-multiselect p-component p-inputwrapper"
+                          data-pc-name="multiselect"
                           data-pc-section="root"
+                          data-testid="multi-select"
+                          id="multi-select"
                         >
-                          <input
-                            aria-autocomplete="none"
-                            aria-controls="pr_id_14_panel"
-                            aria-expanded="false"
-                            aria-haspopup="dialog"
-                            autocomplete="off"
-                            class="p-inputtext p-component p-inputtext p-component"
-                            data-pc-name="inputtext"
-                            data-pc-section="root"
-                            inputmode="none"
-                            role="combobox"
-                            type="text"
-                          />
-                          <button
-                            aria-controls="pr_id_14_panel"
-                            aria-expanded="false"
-                            aria-haspopup="dialog"
-                            aria-label="Choose Date"
-                            class="p-datepicker-trigger p-button p-component p-button-icon-only"
-                            data-pc-name="button"
-                            data-pc-section="root"
-                            tabindex="-1"
-                            type="button"
+                          <div
+                            class="p-hidden-accessible"
+                            data-p-hidden-accessible="true"
+                            data-pc-section="hiddeninputwrapper"
+                          >
+                            <input
+                              aria-expanded="false"
+                              data-pc-section="input"
+                              readonly=""
+                              role="combobox"
+                              tabindex="0"
+                              type="text"
+                            />
+                          </div>
+                          <div
+                            class="p-multiselect-label-container"
+                            data-pc-section="labelcontainer"
+                          >
+                            <div
+                              class="p-multiselect-label p-multiselect-label-empty"
+                              data-pc-section="label"
+                            >
+                              empty
+                            </div>
+                          </div>
+                          <div
+                            class="p-multiselect-trigger"
+                            data-pc-section="trigger"
                           >
                             <svg
                               aria-hidden="true"
-                              class="p-icon"
+                              class="p-icon p-multiselect-trigger-icon p-c"
+                              data-pc-section="triggericon"
                               fill="none"
                               height="14"
                               viewBox="0 0 14 14"
@@ -1959,2252 +2030,352 @@ exports[`Reservation List  Reservation List  correctly with data 1`] = `
                               xmlns="http://www.w3.org/2000/svg"
                             >
                               <path
-                                d="M10.7838 1.51351H9.83783V0.567568C9.83783 0.417039 9.77804 0.272676 9.6716 0.166237C9.56516 0.0597971 9.42079 0 9.27027 0C9.11974 0 8.97538 0.0597971 8.86894 0.166237C8.7625 0.272676 8.7027 0.417039 8.7027 0.567568V1.51351H5.29729V0.567568C5.29729 0.417039 5.2375 0.272676 5.13106 0.166237C5.02462 0.0597971 4.88025 0 4.72973 0C4.5792 0 4.43484 0.0597971 4.3284 0.166237C4.22196 0.272676 4.16216 0.417039 4.16216 0.567568V1.51351H3.21621C2.66428 1.51351 2.13494 1.73277 1.74467 2.12305C1.35439 2.51333 1.13513 3.04266 1.13513 3.59459V11.9189C1.13513 12.4709 1.35439 13.0002 1.74467 13.3905C2.13494 13.7807 2.66428 14 3.21621 14H10.7838C11.3357 14 11.865 13.7807 12.2553 13.3905C12.6456 13.0002 12.8649 12.4709 12.8649 11.9189V3.59459C12.8649 3.04266 12.6456 2.51333 12.2553 2.12305C11.865 1.73277 11.3357 1.51351 10.7838 1.51351ZM3.21621 2.64865H4.16216V3.59459C4.16216 3.74512 4.22196 3.88949 4.3284 3.99593C4.43484 4.10237 4.5792 4.16216 4.72973 4.16216C4.88025 4.16216 5.02462 4.10237 5.13106 3.99593C5.2375 3.88949 5.29729 3.74512 5.29729 3.59459V2.64865H8.7027V3.59459C8.7027 3.74512 8.7625 3.88949 8.86894 3.99593C8.97538 4.10237 9.11974 4.16216 9.27027 4.16216C9.42079 4.16216 9.56516 4.10237 9.6716 3.99593C9.77804 3.88949 9.83783 3.74512 9.83783 3.59459V2.64865H10.7838C11.0347 2.64865 11.2753 2.74831 11.4527 2.92571C11.6301 3.10311 11.7297 3.34371 11.7297 3.59459V5.67568H2.27027V3.59459C2.27027 3.34371 2.36993 3.10311 2.54733 2.92571C2.72473 2.74831 2.96533 2.64865 3.21621 2.64865ZM10.7838 12.8649H3.21621C2.96533 12.8649 2.72473 12.7652 2.54733 12.5878C2.36993 12.4104 2.27027 12.1698 2.27027 11.9189V6.81081H11.7297V11.9189C11.7297 12.1698 11.6301 12.4104 11.4527 12.5878C11.2753 12.7652 11.0347 12.8649 10.7838 12.8649Z"
+                                d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
                                 fill="currentColor"
                               />
                             </svg>
-                            <span
-                              class="p-button-label p-c"
-                              data-pc-section="label"
-                            >
-                               
-                            </span>
-                          </button>
-                        </span>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
                 </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-            <th
-              class="notfixed-column-td-Updatedat"
-              role="tablehead"
-            >
-              <div
-                style="display: flex; flex-direction: row; height: 100%;"
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 75px;"
               >
                 <div
-                  style="display: flex;"
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
                 >
                   <div
-                    style="display: grid; vertical-align: bottom;"
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
                   >
                     <div
-                      class=""
-                      colspan="1"
-                      role="columnheader"
-                      style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative; cursor: pointer;"
-                      title="Toggle SortBy"
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
                     >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
                       <div
-                        aria-describedby="rbd-hidden-text-0-hidden-text-0"
-                        data-rbd-drag-handle-context-id="0"
-                        data-rbd-drag-handle-draggable-id="Updated at"
-                        data-rbd-draggable-context-id="0"
-                        data-rbd-draggable-id="Updated at"
-                        draggable="false"
-                        role="button"
-                        style="transform: translate(0,0); user-select: none; cursor: default;"
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
                         tabindex="0"
-                      >
-                        Updated at
-                      </div>
+                      />
                     </div>
-                    <div>
-                      <div
-                        class="table-filter"
-                      >
-                        <span
-                          class="p-calendar p-component p-inputwrapper p-calendar-w-btn p-calendar-w-btn-right"
-                          data-pc-name="calendar"
-                          data-pc-section="root"
-                        >
-                          <input
-                            aria-autocomplete="none"
-                            aria-controls="pr_id_15_panel"
-                            aria-expanded="false"
-                            aria-haspopup="dialog"
-                            autocomplete="off"
-                            class="p-inputtext p-component p-inputtext p-component"
-                            data-pc-name="inputtext"
-                            data-pc-section="root"
-                            inputmode="none"
-                            role="combobox"
-                            type="text"
-                          />
-                          <button
-                            aria-controls="pr_id_15_panel"
-                            aria-expanded="false"
-                            aria-haspopup="dialog"
-                            aria-label="Choose Date"
-                            class="p-datepicker-trigger p-button p-component p-button-icon-only"
-                            data-pc-name="button"
-                            data-pc-section="root"
-                            tabindex="-1"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="p-icon"
-                              fill="none"
-                              height="14"
-                              viewBox="0 0 14 14"
-                              width="14"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M10.7838 1.51351H9.83783V0.567568C9.83783 0.417039 9.77804 0.272676 9.6716 0.166237C9.56516 0.0597971 9.42079 0 9.27027 0C9.11974 0 8.97538 0.0597971 8.86894 0.166237C8.7625 0.272676 8.7027 0.417039 8.7027 0.567568V1.51351H5.29729V0.567568C5.29729 0.417039 5.2375 0.272676 5.13106 0.166237C5.02462 0.0597971 4.88025 0 4.72973 0C4.5792 0 4.43484 0.0597971 4.3284 0.166237C4.22196 0.272676 4.16216 0.417039 4.16216 0.567568V1.51351H3.21621C2.66428 1.51351 2.13494 1.73277 1.74467 2.12305C1.35439 2.51333 1.13513 3.04266 1.13513 3.59459V11.9189C1.13513 12.4709 1.35439 13.0002 1.74467 13.3905C2.13494 13.7807 2.66428 14 3.21621 14H10.7838C11.3357 14 11.865 13.7807 12.2553 13.3905C12.6456 13.0002 12.8649 12.4709 12.8649 11.9189V3.59459C12.8649 3.04266 12.6456 2.51333 12.2553 2.12305C11.865 1.73277 11.3357 1.51351 10.7838 1.51351ZM3.21621 2.64865H4.16216V3.59459C4.16216 3.74512 4.22196 3.88949 4.3284 3.99593C4.43484 4.10237 4.5792 4.16216 4.72973 4.16216C4.88025 4.16216 5.02462 4.10237 5.13106 3.99593C5.2375 3.88949 5.29729 3.74512 5.29729 3.59459V2.64865H8.7027V3.59459C8.7027 3.74512 8.7625 3.88949 8.86894 3.99593C8.97538 4.10237 9.11974 4.16216 9.27027 4.16216C9.42079 4.16216 9.56516 4.10237 9.6716 3.99593C9.77804 3.88949 9.83783 3.74512 9.83783 3.59459V2.64865H10.7838C11.0347 2.64865 11.2753 2.74831 11.4527 2.92571C11.6301 3.10311 11.7297 3.34371 11.7297 3.59459V5.67568H2.27027V3.59459C2.27027 3.34371 2.36993 3.10311 2.54733 2.92571C2.72473 2.74831 2.96533 2.64865 3.21621 2.64865ZM10.7838 12.8649H3.21621C2.96533 12.8649 2.72473 12.7652 2.54733 12.5878C2.36993 12.4104 2.27027 12.1698 2.27027 11.9189V6.81081H11.7297V11.9189C11.7297 12.1698 11.6301 12.4104 11.4527 12.5878C11.2753 12.7652 11.0347 12.8649 10.7838 12.8649Z"
-                                fill="currentColor"
-                              />
-                            </svg>
-                            <span
-                              class="p-button-label p-c"
-                              data-pc-section="label"
-                            >
-                               
-                            </span>
-                          </button>
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="resizer "
-                  draggable="false"
-                  role="separator"
-                  style="cursor: col-resize;"
-                />
-              </div>
-            </th>
-          </tr>
-        </thead>
-        <tbody
-          role="rowgroup"
-        >
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="15"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/15"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842724 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842724 3C48/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 17:21:54 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 17:31:54 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 00:10:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614, CS001, CS002 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:05 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="16"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/16"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842726 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842726 P061P061REF/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 17:32:54 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 21:32:54 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 04:00:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:09 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:09 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="17"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/17"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842728 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842728 3C196/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 21:33:54 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 21:43:54 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 00:10:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:12 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:12 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="18"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/18"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842738 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842738 3C48/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 15:25:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 15:35:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 00:10:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614, CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:17 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:17 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="19"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/19"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842740 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842740 P057P066REF/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 15:36:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 23:36:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 08:00:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614, CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:19 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:19 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="20"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/20"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842742 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842742 3C196/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 23:37:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 23:47:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 00:10:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614, CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:22 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:22 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="21"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/21"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842752 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842752 3C295/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 07:29:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 07:39:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 00:10:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614, CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:24 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:24 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="22"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/22"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842754 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842754 P285P281REF/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 07:40:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 11:40:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 04:00:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:28 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:28 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
-          >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="23"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/23"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT14_004 observation 842756 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT14_004 842756 3C48/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 11:41:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-21 11:51:05 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 00:10:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509, DE601, DE602, DE603, DE604, DE605, FR606, SE607, UK608, DE609, PL610, PL611, IE613, LV614 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 75px;"
               >
-                 2022-01-20 12:44:30 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
+                <div
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
+                >
+                  <div
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
+                  >
+                    <div
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
+                      <div
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
+                        tabindex="0"
+                      />
+                    </div>
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 75px;"
               >
-                 2022-01-20 12:44:30 
-              </div>
-            </td>
-          </tr>
-          <tr
-            class=""
-            data-testid="tablerow"
-            role="row"
-            style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+                <div
+                  class="p-column-filter p-fluid p-column-filter-row"
+                  data-pc-section="columnfilter"
+                >
+                  <div
+                    class="p-fluid p-column-filter-element"
+                    data-pc-section="filterinput"
+                  >
+                    <div
+                      class="p-tristatecheckbox p-checkbox p-component p-highlight"
+                      data-p-disabled="false"
+                      data-pc-name="tristatecheckbox"
+                      data-pc-section="root"
+                      style="width: 15px; height: 24.2014px;"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="p-checkbox-input"
+                        data-pc-section="input"
+                        type="checkbox"
+                        value=""
+                      />
+                      <span
+                        aria-live="polite"
+                        class="p-sr-only p-hidden-accessible"
+                        data-pc-section="sronlyaria"
+                      >
+                        Not Selected
+                      </span>
+                      <div
+                        aria-checked="false"
+                        class="p-checkbox-box"
+                        data-pc-section="box"
+                        role="checkbox"
+                        tabindex="0"
+                      />
+                    </div>
+                  </div>
+                  <button
+                    aria-label="Clear"
+                    class="p-column-filter-clear-button p-link p-hidden-space"
+                    data-pc-section="headerfilterclearbutton"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="p-icon"
+                      data-pc-section="filterclearicon"
+                      fill="none"
+                      height="14"
+                      viewBox="0 0 14 14"
+                      width="14"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z"
+                        fill="currentColor"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </th>
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
+              />
+              <th
+                class="p-filter-column"
+                data-pc-name="datatable"
+                data-pc-section="headercell"
+                style="min-width: 180px;"
+              />
+            </tr>
+          </thead>
+          <tbody
+            class="p-datatable-tbody"
+            data-pc-section="tbody"
+            role=" rowgroup"
           >
-            <td
-              class="fixed-column-td"
-            >
-              <div>
-                <input
-                  attr-id="24"
-                  style="width: 15px; height: 15px;"
-                  title="Toggle Row Selected"
-                  type="checkbox"
-                />
-              </div>
-            </td>
-            <td
-              class="fixed-column-td"
-            >
-              <a
-                class="p-link"
-                href="/reservation/view/24"
-                target=""
-              >
-                    
-                <i
-                  class="pi pi-eye"
-                  style="cursor: pointer;"
-                />
-                    
-              </a>
-            </td>
-            <td
-              class="notfixed-column-td-SystemId"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 OTDB LT16_004 observation 842930 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Description"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 A reservation while OTDB observation LT16_004 842930 c17_o072.3_3c380/1/TO (Target Observation) is observing 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-StartTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 13:21:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-EndTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 14:21:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Duration(DaysHH:mm:ss)"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 000 01:00:00 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-ReservationType"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 other 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Subject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 system 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Planned"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Stations"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 CS001, CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS032, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS307, RS310, RS406, RS407, RS409, RS503, RS508, RS509 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-FixedTime"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Dynamic"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Fixedproject"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Projects"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                  
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Expert"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 true 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-HBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-LBA-RFI"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 false 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Createdat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:33 
-              </div>
-            </td>
-            <td
-              class="notfixed-column-td-Updatedat"
-            >
-              <div
-                style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
-              >
-                 2022-01-20 12:44:33 
-              </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <div />
-    <div
-      class="pagination p-grid"
-    >
+            <tr
+              class="p-datatable-emptymessage"
+              data-pc-section="emptymessage"
+              role="row"
+            >
+              <td
+                colspan="22"
+                data-pc-name="datatable"
+                data-pc-section="bodycell"
+                role="cell"
+              >
+                No available options
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
       <div
-        class="total_records_bottom_label"
+        class="p-paginator-bottom p-paginator p-component"
+        data-pc-name="paginator"
+        data-pc-section="root"
       >
-        <label>
-          Filtered 10 from 9090
-        </label>
-      </div>
-      <div>
         <div
-          class="p-paginator p-component"
-          data-pc-name="paginator"
+          class="p-dropdown p-component p-inputwrapper p-disabled p-inputwrapper-filled"
+          data-p-disabled="true"
+          data-p-focus="false"
+          data-pc-name="dropdown"
           data-pc-section="root"
         >
-          <button
-            aria-label="First Page"
-            class="p-paginator-first p-paginator-element p-link p-disabled"
-            data-pc-section="firstpagebutton"
-            disabled=""
-            type="button"
+          <div
+            class="p-hidden-accessible"
+            data-pc-section="hiddenselectedmessage"
           >
-            <svg
-              aria-hidden="true"
-              class="p-icon p-paginator-icon"
-              data-pc-section="firstpageicon"
-              fill="none"
-              height="14"
-              viewBox="0 0 14 14"
-              width="14"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M5.71602 11.164C5.80782 11.2021 5.9063 11.2215 6.00569 11.221C6.20216 11.2301 6.39427 11.1612 6.54025 11.0294C6.68191 10.8875 6.76148 10.6953 6.76148 10.4948C6.76148 10.2943 6.68191 10.1021 6.54025 9.96024L3.51441 6.9344L6.54025 3.90855C6.624 3.76126 6.65587 3.59011 6.63076 3.42254C6.60564 3.25498 6.525 3.10069 6.40175 2.98442C6.2785 2.86815 6.11978 2.79662 5.95104 2.7813C5.78229 2.76598 5.61329 2.80776 5.47112 2.89994L1.97123 6.39983C1.82957 6.54167 1.75 6.73393 1.75 6.9344C1.75 7.13486 1.82957 7.32712 1.97123 7.46896L5.47112 10.9991C5.54096 11.0698 5.62422 11.1259 5.71602 11.164ZM11.0488 10.9689C11.1775 11.1156 11.3585 11.2061 11.5531 11.221C11.7477 11.2061 11.9288 11.1156 12.0574 10.9689C12.1815 10.8302 12.25 10.6506 12.25 10.4645C12.25 10.2785 12.1815 10.0989 12.0574 9.96024L9.03158 6.93439L12.0574 3.90855C12.1248 3.76739 12.1468 3.60881 12.1204 3.45463C12.0939 3.30045 12.0203 3.15826 11.9097 3.04765C11.7991 2.93703 11.6569 2.86343 11.5027 2.83698C11.3486 2.81053 11.19 2.83252 11.0488 2.89994L7.51865 6.36957C7.37699 6.51141 7.29742 6.70367 7.29742 6.90414C7.29742 7.1046 7.37699 7.29686 7.51865 7.4387L11.0488 10.9689Z"
-                fill="currentColor"
-                fill-rule="evenodd"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="Previous Page"
-            class="p-paginator-prev p-paginator-element p-link p-disabled"
-            data-pc-section="prevpagebutton"
-            disabled=""
-            type="button"
+            <input
+              aria-haspopup="listbox"
+              aria-label="Jump to Page Dropdown"
+              data-pc-section="input"
+              disabled=""
+              readonly=""
+              tabindex="-1"
+              type="text"
+              value="15"
+            />
+          </div>
+          <div
+            class="p-hidden-accessible p-dropdown-hidden-select"
+            data-pc-section="hiddenselectedmessage"
           >
-            <svg
+            <select
               aria-hidden="true"
-              class="p-icon p-paginator-icon"
-              data-pc-section="prevpageicon"
-              fill="none"
-              height="14"
-              viewBox="0 0 14 14"
-              width="14"
-              xmlns="http://www.w3.org/2000/svg"
+              data-pc-section="select"
+              tabindex="-1"
             >
-              <path
-                d="M8.75 11.185C8.65146 11.1854 8.55381 11.1662 8.4628 11.1284C8.37179 11.0906 8.28924 11.0351 8.22 10.965L4.72 7.46496C4.57955 7.32433 4.50066 7.13371 4.50066 6.93496C4.50066 6.73621 4.57955 6.54558 4.72 6.40496L8.22 2.93496C8.36095 2.84357 8.52851 2.80215 8.69582 2.81733C8.86312 2.83252 9.02048 2.90344 9.14268 3.01872C9.26487 3.134 9.34483 3.28696 9.36973 3.4531C9.39463 3.61924 9.36303 3.78892 9.28 3.93496L6.28 6.93496L9.28 9.93496C9.42045 10.0756 9.49934 10.2662 9.49934 10.465C9.49934 10.6637 9.42045 10.8543 9.28 10.995C9.13526 11.1257 8.9448 11.1939 8.75 11.185Z"
-                fill="currentColor"
-              />
-            </svg>
-          </button>
+              <option
+                data-pc-section="option"
+                selected=""
+                value="15"
+              >
+                15
+              </option>
+            </select>
+          </div>
           <span
-            class="p-paginator-pages"
-            data-pc-section="pages"
+            class="p-dropdown-label p-inputtext"
+            data-pc-section="input"
+            tabindex="-1"
           >
-            <button
-              aria-current="true"
-              aria-label="Page 1"
-              class="p-paginator-page p-paginator-element p-link p-paginator-page-start p-highlight"
-              data-pc-section="pagebutton"
-              type="button"
-            >
-              1
-            </button>
-            <button
-              aria-label="Page 2"
-              class="p-paginator-page p-paginator-element p-link"
-              data-pc-section="pagebutton"
-              type="button"
-            >
-              2
-            </button>
-            <button
-              aria-label="Page 3"
-              class="p-paginator-page p-paginator-element p-link"
-              data-pc-section="pagebutton"
-              type="button"
-            >
-              3
-            </button>
-            <button
-              aria-label="Page 4"
-              class="p-paginator-page p-paginator-element p-link"
-              data-pc-section="pagebutton"
-              type="button"
-            >
-              4
-            </button>
-            <button
-              aria-label="Page 5"
-              class="p-paginator-page p-paginator-element p-link p-paginator-page-end"
-              data-pc-section="pagebutton"
-              type="button"
-            >
-              5
-            </button>
+            15
           </span>
-          <button
-            aria-label="Next Page"
-            class="p-paginator-next p-paginator-element p-link"
-            data-pc-section="nextpagebutton"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="p-icon p-paginator-icon"
-              data-pc-section="nextpageicon"
-              fill="none"
-              height="14"
-              viewBox="0 0 14 14"
-              width="14"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M5.25 11.1728C5.14929 11.1694 5.05033 11.1455 4.9592 11.1025C4.86806 11.0595 4.78666 10.9984 4.72 10.9228C4.57955 10.7822 4.50066 10.5916 4.50066 10.3928C4.50066 10.1941 4.57955 10.0035 4.72 9.86283L7.72 6.86283L4.72 3.86283C4.66067 3.71882 4.64765 3.55991 4.68275 3.40816C4.71785 3.25642 4.79932 3.11936 4.91585 3.01602C5.03238 2.91268 5.17819 2.84819 5.33305 2.83149C5.4879 2.81479 5.64411 2.84671 5.78 2.92283L9.28 6.42283C9.42045 6.56346 9.49934 6.75408 9.49934 6.95283C9.49934 7.15158 9.42045 7.34221 9.28 7.48283L5.78 10.9228C5.71333 10.9984 5.63193 11.0595 5.5408 11.1025C5.44966 11.1455 5.35071 11.1694 5.25 11.1728Z"
-                fill="currentColor"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="Last Page"
-            class="p-paginator-last p-paginator-element p-link"
-            data-pc-section="lastpagebutton"
-            type="button"
+          <div
+            aria-expanded="false"
+            aria-haspopup="listbox"
+            aria-label="Choose"
+            class="p-dropdown-trigger"
+            data-pc-section="trigger"
+            role="button"
           >
             <svg
               aria-hidden="true"
-              class="p-icon p-paginator-icon"
-              data-pc-section="lastpageicon"
+              class="p-icon p-dropdown-trigger-icon p-clickable"
+              data-pc-section="dropdownicon"
+              data-pr-overlay-visible="false"
               fill="none"
               height="14"
               viewBox="0 0 14 14"
@@ -4212,129 +2383,171 @@ exports[`Reservation List  Reservation List  correctly with data 1`] = `
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                clip-rule="evenodd"
-                d="M7.68757 11.1451C7.7791 11.1831 7.8773 11.2024 7.9764 11.2019C8.07769 11.1985 8.17721 11.1745 8.26886 11.1312C8.36052 11.088 8.44238 11.0265 8.50943 10.9505L12.0294 7.49085C12.1707 7.34942 12.25 7.15771 12.25 6.95782C12.25 6.75794 12.1707 6.56622 12.0294 6.42479L8.50943 2.90479C8.37014 2.82159 8.20774 2.78551 8.04633 2.80192C7.88491 2.81833 7.73309 2.88635 7.6134 2.99588C7.4937 3.10541 7.41252 3.25061 7.38189 3.40994C7.35126 3.56927 7.37282 3.73423 7.44337 3.88033L10.4605 6.89748L7.44337 9.91463C7.30212 10.0561 7.22278 10.2478 7.22278 10.4477C7.22278 10.6475 7.30212 10.8393 7.44337 10.9807C7.51301 11.0512 7.59603 11.1071 7.68757 11.1451ZM1.94207 10.9505C2.07037 11.0968 2.25089 11.1871 2.44493 11.2019C2.63898 11.1871 2.81949 11.0968 2.94779 10.9505L6.46779 7.49085C6.60905 7.34942 6.68839 7.15771 6.68839 6.95782C6.68839 6.75793 6.60905 6.56622 6.46779 6.42479L2.94779 2.90479C2.80704 2.83757 2.6489 2.81563 2.49517 2.84201C2.34143 2.86839 2.19965 2.94178 2.08936 3.05207C1.97906 3.16237 1.90567 3.30415 1.8793 3.45788C1.85292 3.61162 1.87485 3.76975 1.94207 3.9105L4.95922 6.92765L1.94207 9.9448C1.81838 10.0831 1.75 10.2621 1.75 10.4477C1.75 10.6332 1.81838 10.8122 1.94207 10.9505Z"
+                d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
                 fill="currentColor"
-                fill-rule="evenodd"
               />
             </svg>
-          </button>
-          <div
-            class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled"
-            data-p-disabled="false"
-            data-p-focus="false"
-            data-pc-name="dropdown"
-            data-pc-section="root"
-          >
-            <div
-              class="p-hidden-accessible"
-              data-pc-section="hiddenselectedmessage"
-            >
-              <input
-                aria-haspopup="listbox"
-                aria-label="Jump to Page Dropdown"
-                data-pc-section="input"
-                readonly=""
-                tabindex="0"
-                type="text"
-                value="10"
-              />
-            </div>
-            <div
-              class="p-hidden-accessible p-dropdown-hidden-select"
-              data-pc-section="hiddenselectedmessage"
-            >
-              <select
-                aria-hidden="true"
-                data-pc-section="select"
-                tabindex="-1"
-              >
-                <option
-                  data-pc-section="option"
-                  selected=""
-                  value="10"
-                >
-                  10
-                </option>
-              </select>
-            </div>
-            <span
-              class="p-dropdown-label p-inputtext"
-              data-pc-section="input"
-              tabindex="-1"
-            >
-              10
-            </span>
-            <div
-              aria-expanded="false"
-              aria-haspopup="listbox"
-              aria-label="Choose"
-              class="p-dropdown-trigger"
-              data-pc-section="trigger"
-              role="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="p-icon p-dropdown-trigger-icon p-clickable"
-                data-pc-section="dropdownicon"
-                data-pr-overlay-visible="false"
-                fill="none"
-                height="14"
-                viewBox="0 0 14 14"
-                width="14"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M7.01744 10.398C6.91269 10.3985 6.8089 10.378 6.71215 10.3379C6.61541 10.2977 6.52766 10.2386 6.45405 10.1641L1.13907 4.84913C1.03306 4.69404 0.985221 4.5065 1.00399 4.31958C1.02276 4.13266 1.10693 3.95838 1.24166 3.82747C1.37639 3.69655 1.55301 3.61742 1.74039 3.60402C1.92777 3.59062 2.11386 3.64382 2.26584 3.75424L7.01744 8.47394L11.769 3.75424C11.9189 3.65709 12.097 3.61306 12.2748 3.62921C12.4527 3.64535 12.6199 3.72073 12.7498 3.84328C12.8797 3.96582 12.9647 4.12842 12.9912 4.30502C13.0177 4.48162 12.9841 4.662 12.8958 4.81724L7.58083 10.1322C7.50996 10.2125 7.42344 10.2775 7.32656 10.3232C7.22968 10.3689 7.12449 10.3944 7.01744 10.398Z"
-                  fill="currentColor"
-                />
-              </svg>
-            </div>
           </div>
         </div>
-      </div>
-      <div
-        class="custom-page"
-      >
+        <button
+          aria-label="First Page"
+          class="p-paginator-first p-paginator-element p-link p-disabled"
+          data-pc-section="firstpagebutton"
+          disabled=""
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="p-icon p-paginator-icon"
+            data-pc-section="firstpageicon"
+            fill="none"
+            height="14"
+            viewBox="0 0 14 14"
+            width="14"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M5.71602 11.164C5.80782 11.2021 5.9063 11.2215 6.00569 11.221C6.20216 11.2301 6.39427 11.1612 6.54025 11.0294C6.68191 10.8875 6.76148 10.6953 6.76148 10.4948C6.76148 10.2943 6.68191 10.1021 6.54025 9.96024L3.51441 6.9344L6.54025 3.90855C6.624 3.76126 6.65587 3.59011 6.63076 3.42254C6.60564 3.25498 6.525 3.10069 6.40175 2.98442C6.2785 2.86815 6.11978 2.79662 5.95104 2.7813C5.78229 2.76598 5.61329 2.80776 5.47112 2.89994L1.97123 6.39983C1.82957 6.54167 1.75 6.73393 1.75 6.9344C1.75 7.13486 1.82957 7.32712 1.97123 7.46896L5.47112 10.9991C5.54096 11.0698 5.62422 11.1259 5.71602 11.164ZM11.0488 10.9689C11.1775 11.1156 11.3585 11.2061 11.5531 11.221C11.7477 11.2061 11.9288 11.1156 12.0574 10.9689C12.1815 10.8302 12.25 10.6506 12.25 10.4645C12.25 10.2785 12.1815 10.0989 12.0574 9.96024L9.03158 6.93439L12.0574 3.90855C12.1248 3.76739 12.1468 3.60881 12.1204 3.45463C12.0939 3.30045 12.0203 3.15826 11.9097 3.04765C11.7991 2.93703 11.6569 2.86343 11.5027 2.83698C11.3486 2.81053 11.19 2.83252 11.0488 2.89994L7.51865 6.36957C7.37699 6.51141 7.29742 6.70367 7.29742 6.90414C7.29742 7.1046 7.37699 7.29686 7.51865 7.4387L11.0488 10.9689Z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </button>
+        <button
+          aria-label="Previous Page"
+          class="p-paginator-prev p-paginator-element p-link p-disabled"
+          data-pc-section="prevpagebutton"
+          disabled=""
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="p-icon p-paginator-icon"
+            data-pc-section="prevpageicon"
+            fill="none"
+            height="14"
+            viewBox="0 0 14 14"
+            width="14"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M8.75 11.185C8.65146 11.1854 8.55381 11.1662 8.4628 11.1284C8.37179 11.0906 8.28924 11.0351 8.22 10.965L4.72 7.46496C4.57955 7.32433 4.50066 7.13371 4.50066 6.93496C4.50066 6.73621 4.57955 6.54558 4.72 6.40496L8.22 2.93496C8.36095 2.84357 8.52851 2.80215 8.69582 2.81733C8.86312 2.83252 9.02048 2.90344 9.14268 3.01872C9.26487 3.134 9.34483 3.28696 9.36973 3.4531C9.39463 3.61924 9.36303 3.78892 9.28 3.93496L6.28 6.93496L9.28 9.93496C9.42045 10.0756 9.49934 10.2662 9.49934 10.465C9.49934 10.6637 9.42045 10.8543 9.28 10.995C9.13526 11.1257 8.9448 11.1939 8.75 11.185Z"
+              fill="currentColor"
+            />
+          </svg>
+        </button>
         <span
-          class="p-inputnumber p-component p-inputwrapper"
-          data-pc-name="inputnumber"
-          data-pc-section="root"
-          id="customPageBottom"
-          style="width: 100px;"
+          class="p-paginator-pages"
+          data-pc-section="pages"
+        />
+        <span
+          aria-live="polite"
+          class="p-paginator-current"
+          data-pc-section="current"
         >
-          <input
-            aria-valuemin="0"
-            class="p-inputnumber-input p-inputtext p-component"
-            data-pc-name="inputtext"
-            data-pc-section="root"
-            inputmode="numeric"
-            min="0"
-            role="spinbutton"
-            type="text"
-            value=""
-          />
+           (0 to 0 of 0)
         </span>
-        <label>
-          Records/Page
-        </label>
         <button
-          class="p-button p-component"
-          data-pc-name="button"
-          data-pc-section="root"
-          style="width: 100px;"
+          aria-label="Next Page"
+          class="p-paginator-next p-paginator-element p-link p-disabled"
+          data-pc-section="nextpagebutton"
+          disabled=""
+          type="button"
         >
-           Show 
+          <svg
+            aria-hidden="true"
+            class="p-icon p-paginator-icon"
+            data-pc-section="nextpageicon"
+            fill="none"
+            height="14"
+            viewBox="0 0 14 14"
+            width="14"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M5.25 11.1728C5.14929 11.1694 5.05033 11.1455 4.9592 11.1025C4.86806 11.0595 4.78666 10.9984 4.72 10.9228C4.57955 10.7822 4.50066 10.5916 4.50066 10.3928C4.50066 10.1941 4.57955 10.0035 4.72 9.86283L7.72 6.86283L4.72 3.86283C4.66067 3.71882 4.64765 3.55991 4.68275 3.40816C4.71785 3.25642 4.79932 3.11936 4.91585 3.01602C5.03238 2.91268 5.17819 2.84819 5.33305 2.83149C5.4879 2.81479 5.64411 2.84671 5.78 2.92283L9.28 6.42283C9.42045 6.56346 9.49934 6.75408 9.49934 6.95283C9.49934 7.15158 9.42045 7.34221 9.28 7.48283L5.78 10.9228C5.71333 10.9984 5.63193 11.0595 5.5408 11.1025C5.44966 11.1455 5.35071 11.1694 5.25 11.1728Z"
+              fill="currentColor"
+            />
+          </svg>
         </button>
         <button
-          class="p-button p-component"
-          data-pc-name="button"
-          data-pc-section="root"
-          style="margin-left: 1em; width: 100px;"
+          aria-label="Last Page"
+          class="p-paginator-last p-paginator-element p-link p-disabled"
+          data-pc-section="lastpagebutton"
+          disabled=""
+          type="button"
         >
-           Show All 
+          <svg
+            aria-hidden="true"
+            class="p-icon p-paginator-icon"
+            data-pc-section="lastpageicon"
+            fill="none"
+            height="14"
+            viewBox="0 0 14 14"
+            width="14"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M7.68757 11.1451C7.7791 11.1831 7.8773 11.2024 7.9764 11.2019C8.07769 11.1985 8.17721 11.1745 8.26886 11.1312C8.36052 11.088 8.44238 11.0265 8.50943 10.9505L12.0294 7.49085C12.1707 7.34942 12.25 7.15771 12.25 6.95782C12.25 6.75794 12.1707 6.56622 12.0294 6.42479L8.50943 2.90479C8.37014 2.82159 8.20774 2.78551 8.04633 2.80192C7.88491 2.81833 7.73309 2.88635 7.6134 2.99588C7.4937 3.10541 7.41252 3.25061 7.38189 3.40994C7.35126 3.56927 7.37282 3.73423 7.44337 3.88033L10.4605 6.89748L7.44337 9.91463C7.30212 10.0561 7.22278 10.2478 7.22278 10.4477C7.22278 10.6475 7.30212 10.8393 7.44337 10.9807C7.51301 11.0512 7.59603 11.1071 7.68757 11.1451ZM1.94207 10.9505C2.07037 11.0968 2.25089 11.1871 2.44493 11.2019C2.63898 11.1871 2.81949 11.0968 2.94779 10.9505L6.46779 7.49085C6.60905 7.34942 6.68839 7.15771 6.68839 6.95782C6.68839 6.75793 6.60905 6.56622 6.46779 6.42479L2.94779 2.90479C2.80704 2.83757 2.6489 2.81563 2.49517 2.84201C2.34143 2.86839 2.19965 2.94178 2.08936 3.05207C1.97906 3.16237 1.90567 3.30415 1.8793 3.45788C1.85292 3.61162 1.87485 3.76975 1.94207 3.9105L4.95922 6.92765L1.94207 9.9448C1.81838 10.0831 1.75 10.2621 1.75 10.4477C1.75 10.6332 1.81838 10.8122 1.94207 10.9505Z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
         </button>
       </div>
+      <div
+        class="p-column-resizer-helper"
+        data-pc-section="resizehelper"
+        style="display: none;"
+      />
+      <span
+        class="p-datatable-reorder-indicator-up"
+        data-pc-section="reorderindicatorup"
+        style="position: absolute; display: none;"
+      >
+        <svg
+          aria-hidden="true"
+          class="p-icon"
+          data-pc-section="reorderindicatorupicon"
+          fill="none"
+          height="14"
+          viewBox="0 0 14 14"
+          width="14"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M6.99994 14C6.91097 14.0004 6.82281 13.983 6.74064 13.9489C6.65843 13.9148 6.58387 13.8646 6.52133 13.8013L1.10198 8.38193C0.982318 8.25351 0.917175 8.08367 0.920272 7.90817C0.923368 7.73267 0.994462 7.56523 1.11858 7.44111C1.24269 7.317 1.41014 7.2459 1.58563 7.2428C1.76113 7.23971 1.93098 7.30485 2.0594 7.42451L6.32263 11.6877V0.677419C6.32263 0.497756 6.394 0.325452 6.52104 0.198411C6.64808 0.0713706 6.82039 0 7.00005 0C7.17971 0 7.35202 0.0713706 7.47906 0.198411C7.6061 0.325452 7.67747 0.497756 7.67747 0.677419V11.6877L11.9407 7.42451C12.0691 7.30485 12.2389 7.23971 12.4144 7.2428C12.5899 7.2459 12.7574 7.317 12.8815 7.44111C13.0056 7.56523 13.0767 7.73267 13.0798 7.90817C13.0829 8.08367 13.0178 8.25351 12.8981 8.38193L7.47875 13.8013C7.41621 13.8646 7.34164 13.9148 7.25944 13.9489C7.17727 13.983 7.08912 14.0004 7.00015 14C7.00012 14 7.00009 14 7.00005 14C7.00001 14 6.99998 14 6.99994 14Z"
+            fill="currentColor"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </span>
+      <span
+        class="p-datatable-reorder-indicator-down"
+        data-pc-section="reorderindicatordown"
+        style="position: absolute; display: none;"
+      >
+        <svg
+          aria-hidden="true"
+          class="p-icon"
+          data-pc-section="reorderindicatordownicon"
+          fill="none"
+          height="14"
+          viewBox="0 0 14 14"
+          width="14"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M6.51551 13.799C6.64205 13.9255 6.813 13.9977 6.99193 14C7.17087 13.9977 7.34182 13.9255 7.46835 13.799C7.59489 13.6725 7.66701 13.5015 7.66935 13.3226V2.31233L11.9326 6.57554C11.9951 6.63887 12.0697 6.68907 12.1519 6.72319C12.2341 6.75731 12.3223 6.77467 12.4113 6.77425C12.5003 6.77467 12.5885 6.75731 12.6707 6.72319C12.7529 6.68907 12.8274 6.63887 12.89 6.57554C13.0168 6.44853 13.0881 6.27635 13.0881 6.09683C13.0881 5.91732 13.0168 5.74514 12.89 5.61812L7.48846 0.216594C7.48274 0.210436 7.4769 0.204374 7.47094 0.198411C7.3439 0.0713707 7.1716 0 6.99193 0C6.81227 0 6.63997 0.0713707 6.51293 0.198411C6.50704 0.204296 6.50128 0.210278 6.49563 0.216354L1.09386 5.61812C0.974201 5.74654 0.909057 5.91639 0.912154 6.09189C0.91525 6.26738 0.986345 6.43483 1.11046 6.55894C1.23457 6.68306 1.40202 6.75415 1.57752 6.75725C1.75302 6.76035 1.92286 6.6952 2.05128 6.57554L6.31451 2.31231V13.3226C6.31685 13.5015 6.38898 13.6725 6.51551 13.799Z"
+            fill="currentColor"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </span>
     </div>
   </div>
   <div
@@ -4342,7 +2555,6 @@ exports[`Reservation List  Reservation List  correctly with data 1`] = `
     data-testid="confirm_dialog"
     style="opacity: 1;"
   />
-  <div />
 </DocumentFragment>
 `;
 
@@ -4429,6 +2641,5 @@ exports[`Reservation List  Reservation List  renders correctly without proper se
     data-testid="confirm_dialog"
     style="opacity: 1;"
   />
-  <div />
 </DocumentFragment>
 `;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap
index 83a65e306dd97f8cfde7c5668327bbb5c0aae1bd..2a658fea5b1cb265924ac0838b1fff97d695f103 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap
@@ -288,7 +288,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
                 tabindex="0"
               >
                 <span
@@ -348,7 +348,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <span
                   class="p-column-resizer"
@@ -585,6 +585,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
+                style="min-width: 180px;"
                 tabindex="0"
               >
                 <span
@@ -699,7 +700,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <span
                   class="p-column-resizer"
@@ -984,7 +985,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -1034,7 +1035,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -1299,6 +1300,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -1447,7 +1449,7 @@ exports[`Schedulinng Unit List  Schedulinng List  correctly with data 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               />
               <th
                 class="p-filter-column"
@@ -3144,7 +3146,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
                 tabindex="0"
               >
                 <span
@@ -3204,7 +3206,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <span
                   class="p-column-resizer"
@@ -3441,6 +3443,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
+                style="min-width: 180px;"
                 tabindex="0"
               >
                 <span
@@ -3555,7 +3558,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <span
                   class="p-column-resizer"
@@ -3840,7 +3843,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -3890,7 +3893,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -4155,6 +4158,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -4303,7 +4307,7 @@ exports[`Schedulinng Unit List Lite  Schedulinng List Lite  correctly with data
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               />
               <th
                 class="p-filter-column"
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/systemevent.list.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/systemevent.list.test.js.snap
index 00cb80b63cf28805dc844d75dfd9f175656cdf7f..030d58fc4d9adee6cb470489315ffeaecf0705b1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/systemevent.list.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/systemevent.list.test.js.snap
@@ -621,7 +621,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">iacobelli@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">analysed</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">CS001, CS002, CS003, CS004, CS005, CS006</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/1144\\">1144</a></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
@@ -639,7 +639,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">iacobelli@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">analysed</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">CS001, CS002, CS003, CS004, CS005, CS006</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/11623\\">11623</a></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
@@ -657,7 +657,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">blaauw@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">analysed</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">DE602</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
@@ -675,7 +675,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">hmulder@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">airco issue, station trips</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">analysed</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">PL612</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
@@ -694,7 +694,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">hmulder@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">open</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">UK608</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
@@ -712,7 +712,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">shulevski@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">Test for QA workflow</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">analysed</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">CS005</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/23484\\">23484</a></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
@@ -730,7 +730,7 @@ exports[`Systen Event List Lite  System Event Renders correctly with data 1`] =
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">hmulder@astron.nl</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">Since the flooding in July 2021 the station has been getting lots of spare parts SPU/TDS/RSP there is a big problem with short circuits that needs to be looked at on site as it is draining out spare parts. Since everything we sent gets broken</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">open</td>
-            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"></td>
+            <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\">DE601</td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/30927\\">30927</a><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/30553\\">30553</a><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/30554\\">30554</a><a style=\\"padding-right: 3px;\\" href=\\"/task/view/blueprint/31018\\">31018</a></td>
             <td role=\\"cell\\" data-p-selectable-cell=\\"false\\" data-p-selection-column=\\"false\\" data-p-editable-column=\\"false\\" data-p-cell-editing=\\"false\\" data-p-frozen-column=\\"false\\" data-pc-name=\\"datatable\\" data-pc-section=\\"bodycell\\"><a target=\\"_blank\\" rel=\\"noreferrer\\"></a></td>
           </tr>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/task.list.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/task.list.test.js.snap
index 10b728bae7e154c02b9df9f03245080f347b6491..7de94873cf5989aca9c7781736a566015808893e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/task.list.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/task.list.test.js.snap
@@ -48,16 +48,16 @@ exports[`Task List  Task List  correctly with data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Scheduling Unit Name</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Scheduling Set</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Project</span></div>
               </th>
-              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">ID</span><span data-pc-section=\\"sort\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon p-sortable-column-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"sorticon\\">
                       <path d=\\"M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z\\" fill=\\"currentColor\\"></path>
                       <path d=\\"M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z\\" fill=\\"currentColor\\"></path>
@@ -92,10 +92,10 @@ exports[`Task List  Task List  correctly with data 1`] = `
               <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 100px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Duration (HH:mm:ss)</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Relative Start Time (HH:mm:ss)</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Relative End Time (HH:mm:ss)</span></div>
               </th>
             </tr>
@@ -113,22 +113,22 @@ exports[`Task List  Task List  correctly with data 1`] = `
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><input class=\\"p-column-filter p-inputtext p-component\\" type=\\"text\\" placeholder=\\"Scheduling Unit Name\\" aria-label=\\"Scheduling Unit Name\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\" value=\\"\\"></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"></th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"></th>
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><input class=\\"p-column-filter p-inputtext p-component\\" type=\\"text\\" placeholder=\\"Project\\" aria-label=\\"Project\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\" value=\\"\\"></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><input class=\\"p-column-filter p-inputtext p-component\\" type=\\"text\\" placeholder=\\"ID\\" aria-label=\\"ID\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\" value=\\"\\"></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
@@ -157,7 +157,7 @@ exports[`Task List  Task List  correctly with data 1`] = `
                 </div>
               </th>
               <th style=\\"min-width: 100px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"></th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\">
                     <div style=\\"display: flex; flex-direction: column;\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"min\\" type=\\"text\\" style=\\"width: 7em;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"max\\" type=\\"text\\" style=\\"width: 7em; margin-top: 5px;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></div>
@@ -166,7 +166,7 @@ exports[`Task List  Task List  correctly with data 1`] = `
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\">
                     <div style=\\"display: flex; flex-direction: column;\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"min\\" type=\\"text\\" style=\\"width: 7em;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"max\\" type=\\"text\\" style=\\"width: 7em; margin-top: 5px;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></div>
@@ -278,16 +278,16 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Scheduling Unit Name</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Scheduling Set</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Project</span></div>
               </th>
-              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">ID</span><span data-pc-section=\\"sort\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon p-sortable-column-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"sorticon\\">
                       <path d=\\"M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z\\" fill=\\"currentColor\\"></path>
                       <path d=\\"M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z\\" fill=\\"currentColor\\"></path>
@@ -322,7 +322,7 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 180px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Observation Start Time</span><span data-pc-section=\\"sort\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon p-sortable-column-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"sorticon\\">
                       <path d=\\"M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z\\" fill=\\"currentColor\\"></path>
                       <path d=\\"M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z\\" fill=\\"currentColor\\"></path>
@@ -330,7 +330,7 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 180px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Observation End Time</span><span data-pc-section=\\"sort\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon p-sortable-column-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"sorticon\\">
                       <path d=\\"M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z\\" fill=\\"currentColor\\"></path>
                       <path d=\\"M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z\\" fill=\\"currentColor\\"></path>
@@ -338,7 +338,7 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 180px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Process Start Time</span><span data-pc-section=\\"sort\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon p-sortable-column-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"sorticon\\">
                       <path d=\\"M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z\\" fill=\\"currentColor\\"></path>
                       <path d=\\"M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z\\" fill=\\"currentColor\\"></path>
@@ -346,7 +346,7 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-sortable-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 180px;\\" role=\\"columnheader\\" tabindex=\\"0\\" aria-sort=\\"none\\" data-p-sortable-column=\\"true\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Process End Time</span><span data-pc-section=\\"sort\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon p-sortable-column-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"sorticon\\">
                       <path d=\\"M5.64515 3.61291C5.47353 3.61291 5.30192 3.54968 5.16644 3.4142L3.38708 1.63484L1.60773 3.4142C1.34579 3.67613 0.912244 3.67613 0.650309 3.4142C0.388374 3.15226 0.388374 2.71871 0.650309 2.45678L2.90837 0.198712C3.17031 -0.0632236 3.60386 -0.0632236 3.86579 0.198712L6.12386 2.45678C6.38579 2.71871 6.38579 3.15226 6.12386 3.4142C5.98837 3.54968 5.81676 3.61291 5.64515 3.61291Z\\" fill=\\"currentColor\\"></path>
                       <path d=\\"M3.38714 14C3.01681 14 2.70972 13.6929 2.70972 13.3226V0.677419C2.70972 0.307097 3.01681 0 3.38714 0C3.75746 0 4.06456 0.307097 4.06456 0.677419V13.3226C4.06456 13.6929 3.75746 14 3.38714 14Z\\" fill=\\"currentColor\\"></path>
@@ -362,10 +362,10 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                       <path d=\\"M10.6129 14C10.2426 14 9.93552 13.6929 9.93552 13.3226V0.677419C9.93552 0.307097 10.2426 0 10.6129 0C10.9833 0 11.2904 0.307097 11.2904 0.677419V13.3226C11.2904 13.6929 10.9832 14 10.6129 14Z\\" fill=\\"currentColor\\"></path>
                     </svg></span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Relative Start Time (HH:mm:ss)</span></div>
               </th>
-              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 120px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
+              <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 140px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
                 <div class=\\"p-column-header-content\\" data-pc-section=\\"headercontent\\"><span class=\\"p-column-title\\" data-pc-section=\\"headertitle\\">Relative End Time (HH:mm:ss)</span></div>
               </th>
               <th class=\\"p-filter-column p-resizable-column p-reorderable-column\\" style=\\"min-width: 100px;\\" role=\\"columnheader\\" data-p-sortable-column=\\"false\\" data-p-resizable-column=\\"true\\" data-p-filter-column=\\"true\\" data-p-frozen-column=\\"false\\" data-p-reorderable-column=\\"true\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"><span class=\\"p-column-resizer\\" data-pc-section=\\"columnresizer\\"></span>
@@ -420,22 +420,22 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><input class=\\"p-column-filter p-inputtext p-component\\" type=\\"text\\" placeholder=\\"Scheduling Unit Name\\" aria-label=\\"Scheduling Unit Name\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\" value=\\"\\"></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"></th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\"></th>
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><input class=\\"p-column-filter p-inputtext p-component\\" type=\\"text\\" placeholder=\\"Project\\" aria-label=\\"Project\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\" value=\\"\\"></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><input class=\\"p-column-filter p-inputtext p-component\\" type=\\"text\\" placeholder=\\"ID\\" aria-label=\\"ID\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\" value=\\"\\"></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
@@ -470,28 +470,28 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                     </svg></button>
                 </div>
               </th>
-              <th class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 180px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><span id=\\"calendar-24h\\" class=\\"p-calendar p-component p-inputwrapper\\" data-pc-name=\\"calendar\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext p-component p-inputtext p-component\\" type=\\"text\\" role=\\"combobox\\" autocomplete=\\"off\\" aria-expanded=\\"false\\" aria-autocomplete=\\"none\\" aria-haspopup=\\"dialog\\" aria-controls=\\"calendar-24h_panel\\" inputmode=\\"none\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></span></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 180px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><span id=\\"calendar-24h\\" class=\\"p-calendar p-component p-inputwrapper\\" data-pc-name=\\"calendar\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext p-component p-inputtext p-component\\" type=\\"text\\" role=\\"combobox\\" autocomplete=\\"off\\" aria-expanded=\\"false\\" aria-autocomplete=\\"none\\" aria-haspopup=\\"dialog\\" aria-controls=\\"calendar-24h_panel\\" inputmode=\\"none\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></span></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 180px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><span id=\\"calendar-24h\\" class=\\"p-calendar p-component p-inputwrapper\\" data-pc-name=\\"calendar\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext p-component p-inputtext p-component\\" type=\\"text\\" role=\\"combobox\\" autocomplete=\\"off\\" aria-expanded=\\"false\\" aria-autocomplete=\\"none\\" aria-haspopup=\\"dialog\\" aria-controls=\\"calendar-24h_panel\\" inputmode=\\"none\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></span></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
                     </svg></button>
                 </div>
               </th>
-              <th class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 180px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\"><span id=\\"calendar-24h\\" class=\\"p-calendar p-component p-inputwrapper\\" data-pc-name=\\"calendar\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext p-component p-inputtext p-component\\" type=\\"text\\" role=\\"combobox\\" autocomplete=\\"off\\" aria-expanded=\\"false\\" aria-autocomplete=\\"none\\" aria-haspopup=\\"dialog\\" aria-controls=\\"calendar-24h_panel\\" inputmode=\\"none\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></span></div><button class=\\"p-column-filter-clear-button p-link p-hidden-space\\" type=\\"button\\" aria-label=\\"Clear\\" data-pc-section=\\"headerfilterclearbutton\\"><svg width=\\"14\\" height=\\"14\\" viewBox=\\"0 0 14 14\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"p-icon\\" aria-hidden=\\"true\\" data-pc-section=\\"filterclearicon\\">
                       <path fill-rule=\\"evenodd\\" clip-rule=\\"evenodd\\" d=\\"M13.4994 0.0920138C13.5967 0.151519 13.6758 0.236453 13.7283 0.337647C13.7807 0.439133 13.8031 0.553448 13.7929 0.667208C13.7827 0.780968 13.7403 0.889466 13.6707 0.98L11.406 4.06823C11.3099 4.19928 11.1656 4.28679 11.005 4.3115C10.8444 4.33621 10.6805 4.2961 10.5495 4.2C10.4184 4.1039 10.3309 3.95967 10.3062 3.79905C10.2815 3.63843 10.3216 3.47458 10.4177 3.34353L11.9412 1.23529H7.41184C7.24803 1.23529 7.09093 1.17022 6.97509 1.05439C6.85926 0.938558 6.79419 0.781457 6.79419 0.617647C6.79419 0.453837 6.85926 0.296736 6.97509 0.180905C7.09093 0.0650733 7.24803 0 7.41184 0H13.1765C13.2905 0.000692754 13.4022 0.0325088 13.4994 0.0920138ZM4.20008 0.181168H4.24126L13.2013 9.03411C13.3169 9.14992 13.3819 9.3069 13.3819 9.47058C13.3819 9.63426 13.3169 9.79124 13.2013 9.90705C13.1445 9.96517 13.0766 10.0112 13.0016 10.0423C12.9266 10.0735 12.846 10.0891 12.7648 10.0882C12.6836 10.0886 12.6032 10.0728 12.5283 10.0417C12.4533 10.0106 12.3853 9.96479 12.3283 9.90705L9.3142 6.92587L9.26479 6.99999V13.3823C9.26265 13.5455 9.19689 13.7014 9.08152 13.8167C8.96615 13.9321 8.81029 13.9979 8.64714 14H5.35302C5.18987 13.9979 5.03401 13.9321 4.91864 13.8167C4.80327 13.7014 4.73751 13.5455 4.73537 13.3823V6.99999L0.329492 1.02117C0.259855 0.930634 0.21745 0.822137 0.207241 0.708376C0.197031 0.594616 0.21944 0.480301 0.271844 0.378815C0.324343 0.277621 0.403484 0.192687 0.500724 0.133182C0.597964 0.073677 0.709609 0.041861 0.823609 0.0411682H3.86243C3.92448 0.0461551 3.9855 0.060022 4.04361 0.0823446C4.10037 0.10735 4.15311 0.140655 4.20008 0.181168ZM8.02949 6.79411C8.02884 6.66289 8.07235 6.53526 8.15302 6.43176L8.42478 6.05293L3.55773 1.23529H2.0589L5.84714 6.43176C5.92781 6.53526 5.97132 6.66289 5.97067 6.79411V12.7647H8.02949V6.79411Z\\" fill=\\"currentColor\\"></path>
@@ -507,7 +507,7 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\">
                     <div style=\\"display: flex; flex-direction: column;\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"min\\" type=\\"text\\" style=\\"width: 7em;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"max\\" type=\\"text\\" style=\\"width: 7em; margin-top: 5px;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></div>
@@ -516,7 +516,7 @@ exports[`Task List  Task List correctly with blueprint data 1`] = `
                     </svg></button>
                 </div>
               </th>
-              <th style=\\"min-width: 120px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
+              <th style=\\"min-width: 140px;\\" class=\\"p-filter-column\\" data-pc-name=\\"datatable\\" data-pc-section=\\"headercell\\">
                 <div class=\\"p-column-filter p-fluid p-column-filter-row\\" data-pc-section=\\"columnfilter\\">
                   <div class=\\"p-fluid p-column-filter-element\\" data-pc-section=\\"filterinput\\">
                     <div style=\\"display: flex; flex-direction: column;\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"min\\" type=\\"text\\" style=\\"width: 7em;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"><input class=\\"p-inputtext-sm p-inputmask p-inputtext p-component\\" id=\\"max\\" type=\\"text\\" style=\\"width: 7em; margin-top: 5px;\\" placeholder=\\"HH:mm:ss\\" data-pc-name=\\"inputtext\\" data-pc-section=\\"root\\"></div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.list.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.list.test.js.snap
index b2235eebc6ec7ec0d3a642cb90cf13f8fe49c8ff..3447ee108a04df5a5efc22aefe354d7819ed044b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.list.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.list.test.js.snap
@@ -256,6 +256,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
+                style="min-width: 180px;"
                 tabindex="0"
               >
                 <span
@@ -397,7 +398,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
                 tabindex="0"
               >
                 <span
@@ -458,6 +459,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
+                style="min-width: 180px;"
                 tabindex="0"
               >
                 <span
@@ -860,6 +862,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -1193,7 +1196,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -1293,6 +1296,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -1455,6 +1459,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="bodycell"
                 role="cell"
+                style="min-width: 180px;"
               >
                 2023-08-06 02:00:00
               </td>
@@ -1501,7 +1506,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="bodycell"
                 role="cell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 QA Reporting (TO)
               </td>
@@ -1514,6 +1519,7 @@ exports[`Workflow List  Workflow List correctly with data and security 1`] = `
                 data-pc-name="datatable"
                 data-pc-section="bodycell"
                 role="cell"
+                style="min-width: 180px;"
               >
                 2023-08-06 02:00:00
               </td>
@@ -2020,6 +2026,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
+                style="min-width: 180px;"
                 tabindex="0"
               >
                 <span
@@ -2161,7 +2168,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
                 tabindex="0"
               >
                 <span
@@ -2222,6 +2229,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 data-pc-name="datatable"
                 data-pc-section="headercell"
                 role="columnheader"
+                style="min-width: 180px;"
                 tabindex="0"
               >
                 <span
@@ -2624,6 +2632,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -2957,7 +2966,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -3057,6 +3066,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 class="p-filter-column"
                 data-pc-name="datatable"
                 data-pc-section="headercell"
+                style="min-width: 180px;"
               >
                 <div
                   class="p-column-filter p-fluid p-column-filter-row"
@@ -3219,6 +3229,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 data-pc-name="datatable"
                 data-pc-section="bodycell"
                 role="cell"
+                style="min-width: 180px;"
               >
                 2023-08-06 02:00:00
               </td>
@@ -3265,7 +3276,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 data-pc-name="datatable"
                 data-pc-section="bodycell"
                 role="cell"
-                style="min-width: 120px;"
+                style="min-width: 140px;"
               >
                 QA Reporting (TO)
               </td>
@@ -3278,6 +3289,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
                 data-pc-name="datatable"
                 data-pc-section="bodycell"
                 role="cell"
+                style="min-width: 180px;"
               >
                 2023-08-06 02:00:00
               </td>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.test.js.snap
index dff63e77128f9934d5ae20692aaa0eff43725d83..9d9a8de378f032d655958a8a46def074cb27dfd6 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.test.js.snap
@@ -4336,7 +4336,9 @@ exports[`Workflow   Workflow correctly with data and security 1`] = `
                         data-pc-name="datatable"
                         data-pc-section="bodycell"
                         role="cell"
-                      />
+                      >
+                        CS001, CS002, CS003
+                      </td>
                       <td
                         data-p-cell-editing="false"
                         data-p-editable-column="false"
@@ -8918,7 +8920,9 @@ exports[`Workflow   Workflow correctly with data and security: Assigned 1`] = `
                         data-pc-name="datatable"
                         data-pc-section="bodycell"
                         role="cell"
-                      />
+                      >
+                        CS001, CS002, CS003
+                      </td>
                       <td
                         data-p-cell-editing="false"
                         data-p-editable-column="false"
@@ -13500,7 +13504,9 @@ exports[`Workflow   Workflow correctly with data and security: Next 1`] = `
                         data-pc-name="datatable"
                         data-pc-section="bodycell"
                         role="cell"
-                      />
+                      >
+                        CS001, CS002, CS003
+                      </td>
                       <td
                         data-p-cell-editing="false"
                         data-p-editable-column="false"
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/reservation.list.test.js b/SAS/TMSS/frontend/tmss_webapp/src/tests/reservation.list.test.js
index d1b7bec870a3cb7d7ddcd4298b0ccff3ce78ec8c..0608126fcf8ae405befa21d2736e5e9c2aac17e1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/reservation.list.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/reservation.list.test.js
@@ -41,10 +41,7 @@ describe('Reservation List ', () => {
         let {  component } = await RenderReservationist();
         const componentSnapshot = component.asFragment();
        
-        await waitFor(() => {
-            const anchorElement = component.container.querySelector('.fa-search');
-            expect(anchorElement).toBeInTheDocument();
-          });
+    
 
         expect(componentSnapshot).toMatchSnapshot();
         component.unmount();