diff --git a/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json b/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json
index 9025b5254498dc54b958cf9a6b13c1f6496a52fb..3efb3adcb161e77350a333170bb6c5c755475f25 100644
--- a/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json
+++ b/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json
@@ -1,147 +1,152 @@
 {
-  "$id":"http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#",
+  "$id": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/QA/1#",
+  "title": "QA",
   "$schema": "http://json-schema.org/draft-06/schema#",
-  "title":"QA",
-  "description":"This schema defines the parameters to setup and control the Quality Assurance (QA) tasks.",
-  "version":1,
-  "definitions":{
-    "file_conversion":{
-      "type":"object",
-      "title":"File Conversion",
-      "default":{},
-      "description":"Create a QA file for the observation",
-      "properties":{
-        "enabled":{
-          "type":"boolean",
-          "title":"enabled",
-          "default":true,
-          "description":"Do/Don't create a QA file for the observation"
-        },
-        "nr_of_subbands":{
-          "type":"integer",
-          "title":"#subbands",
-          "default":-1,
-          "description":"Keep this number of subbands from the observation in the QA file, or all if -1"
-        },
-        "nr_of_timestamps":{
-          "type":"integer",
-          "title":"#timestamps",
-          "default":256,
-          "minimum":1,
-          "description":"Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)"
-        }
-      },
-      "additionalProperties":false,
+  "version": 1,
+  "definitions": {
+    "QA": {
+      "type": "object",
+      "title": "QA",
+      "default": {},
       "required": [
-        "enabled",
-        "nr_of_subbands",
-        "nr_of_timestamps"]
-    },
-    "plots":{
-      "type":"object",
-      "title":"Plots",
-      "default":{},
-      "description":"Create dynamic spectrum plots",
-      "properties":{
-        "enabled":{
-          "type":"boolean",
-          "title":"enabled",
-          "default":true,
-          "description":"Do/Don't create plots from the QA file from the observation"
-        },
-        "autocorrelation":{
-          "type":"boolean",
-          "title":"autocorrelation",
-          "default":true,
-          "description":"Create autocorrelation plots for all stations"
+        "file_conversion",
+        "plots"
+      ],
+      "properties": {
+        "plots": {
+          "type": "object",
+          "title": "Plots",
+          "default": {},
+          "required": [
+            "enabled",
+            "autocorrelation",
+            "crosscorrelation"
+          ],
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "enabled",
+              "default": true,
+              "description": "Do/Don't create plots from the QA file from the observation"
+            },
+            "autocorrelation": {
+              "type": "boolean",
+              "title": "autocorrelation",
+              "default": true,
+              "description": "Create autocorrelation plots for all stations"
+            },
+            "crosscorrelation": {
+              "type": "boolean",
+              "title": "crosscorrelation",
+              "default": true,
+              "description": "Create crosscorrelation plots for all baselines"
+            }
+          },
+          "description": "Create dynamic spectrum plots",
+          "additionalProperties": false
         },
-        "crosscorrelation":{
-          "type":"boolean",
-          "title":"crosscorrelation",
-          "default":true,
-          "description":"Create crosscorrelation plots for all baselines"
+        "file_conversion": {
+          "type": "object",
+          "title": "File Conversion",
+          "default": {},
+          "required": [
+            "enabled",
+            "nr_of_subbands",
+            "nr_of_timestamps"
+          ],
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "enabled",
+              "default": true,
+              "description": "Do/Don't create a QA file for the observation"
+            },
+            "nr_of_subbands": {
+              "type": "integer",
+              "title": "#subbands",
+              "default": -1,
+              "description": "Keep this number of subbands from the observation in the QA file, or all if -1"
+            },
+            "nr_of_timestamps": {
+              "type": "integer",
+              "title": "#timestamps",
+              "default": 256,
+              "minimum": 1,
+              "description": "Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)"
+            }
+          },
+          "description": "Create a QA file for the observation",
+          "additionalProperties": false
         }
       },
-      "additionalProperties":false,
+      "description": "Perform all Quality Assurance (QA) tasks, including file conversion and plotting.",
+      "additionalProperties": false
+    },
+    "plots": {
+      "type": "object",
+      "title": "Plots",
+      "default": {},
       "required": [
         "enabled",
         "autocorrelation",
-        "crosscorrelation"]
-    },
-    "QA": {
-      "type":"object",
-      "title":"QA",
-      "description":"Perform all Quality Assurance (QA) tasks, including file conversion and plotting.",
-      "default":{},
+        "crosscorrelation"
+      ],
       "properties": {
-    "file_conversion":{
-      "type":"object",
-      "title":"File Conversion",
-      "default":{},
-      "description":"Create a QA file for the observation",
-      "properties":{
-        "enabled":{
-          "type":"boolean",
-          "title":"enabled",
-          "default":true,
-          "description":"Do/Don't create a QA file for the observation"
+        "enabled": {
+          "type": "boolean",
+          "title": "enabled",
+          "default": true,
+          "description": "Do/Don't create plots from the QA file from the observation"
         },
-        "nr_of_subbands":{
-          "type":"integer",
-          "title":"#subbands",
-          "default":-1,
-          "description":"Keep this number of subbands from the observation in the QA file, or all if -1"
+        "autocorrelation": {
+          "type": "boolean",
+          "title": "autocorrelation",
+          "default": true,
+          "description": "Create autocorrelation plots for all stations"
         },
-        "nr_of_timestamps":{
-          "type":"integer",
-          "title":"#timestamps",
-          "default":256,
-          "minimum":1,
-          "description":"Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)"
+        "crosscorrelation": {
+          "type": "boolean",
+          "title": "crosscorrelation",
+          "default": true,
+          "description": "Create crosscorrelation plots for all baselines"
         }
       },
-      "additionalProperties":false,
+      "description": "Create dynamic spectrum plots",
+      "additionalProperties": false
+    },
+    "file_conversion": {
+      "type": "object",
+      "title": "File Conversion",
+      "default": {},
       "required": [
         "enabled",
         "nr_of_subbands",
-        "nr_of_timestamps"]
-    },
-    "plots":{
-      "type":"object",
-      "title":"Plots",
-      "default":{},
-      "description":"Create dynamic spectrum plots",
-      "properties":{
-        "enabled":{
-          "type":"boolean",
-          "title":"enabled",
-          "default":true,
-          "description":"Do/Don't create plots from the QA file from the observation"
+        "nr_of_timestamps"
+      ],
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "enabled",
+          "default": true,
+          "description": "Do/Don't create a QA file for the observation"
         },
-        "autocorrelation":{
-          "type":"boolean",
-          "title":"autocorrelation",
-          "default":true,
-          "description":"Create autocorrelation plots for all stations"
+        "nr_of_subbands": {
+          "type": "integer",
+          "title": "#subbands",
+          "default": -1,
+          "description": "Keep this number of subbands from the observation in the QA file, or all if -1"
         },
-        "crosscorrelation":{
-          "type":"boolean",
-          "title":"crosscorrelation",
-          "default":true,
-          "description":"Create crosscorrelation plots for all baselines"
+        "nr_of_timestamps": {
+          "type": "integer",
+          "title": "#timestamps",
+          "default": 256,
+          "minimum": 1,
+          "description": "Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)"
         }
       },
-      "additionalProperties":false,
-      "required": [
-        "enabled",
-        "autocorrelation",
-        "crosscorrelation"]
-    }        }
-      },
-      "additionalProperties":false,
-      "required": [
-        "file_conversion",
-        "plots"]
+      "description": "Create a QA file for the observation",
+      "additionalProperties": false
     }
-  }
-}
+  },
+  "description": "This schema defines the parameters to setup and control the Quality Assurance (QA) tasks."
+}
\ No newline at end of file
diff --git a/SAS/TMSS/src/tmss/tmssapp/schemas/task_template-target_observation-1.json b/SAS/TMSS/src/tmss/tmssapp/schemas/task_template-target_observation-1.json
index b4e8f19240116149f221b950ae21b90b36462d57..ed66e449198c0b3e3eb7e78eabcd112a9a2111cf 100644
--- a/SAS/TMSS/src/tmss/tmssapp/schemas/task_template-target_observation-1.json
+++ b/SAS/TMSS/src/tmss/tmssapp/schemas/task_template-target_observation-1.json
@@ -1,93 +1,355 @@
 {
-  "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/target observation/1#",
-  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$id": "http://0.0.0.0:8008/api/schemas/tasktemplate/target%20observation/1#",
+  "type": "object",
   "title": "target observation",
-  "description": "This schema defines the parameters to setup a target observation task.",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "version": 1,
-  "type": "object",
+  "required": [
+    "stations",
+    "antenna_set",
+    "filter",
+    "SAPs",
+    "duration",
+    "correlator"
+  ],
   "properties": {
-    "stations": {
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/stations",
-      "default": ["CS001"]
-    },
-    "antenna_set": {
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
-      "default": "HBA_DUAL"
-    },
-    "filter": {
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
-      "default": "HBA_110_190"
-    },
-    "tile_beam": {
-      "title": "Tile beam",
-      "description": "HBA only",
+    "QA": {
+      "type": "object",
+      "title": "QA",
       "default": {},
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
+      "required": [
+        "file_conversion",
+        "plots"
+      ],
+      "properties": {
+        "plots": {
+          "type": "object",
+          "title": "Plots",
+          "default": {},
+          "required": [
+            "enabled",
+            "autocorrelation",
+            "crosscorrelation"
+          ],
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "enabled",
+              "default": true,
+              "description": "Do/Don't create plots from the QA file from the observation"
+            },
+            "autocorrelation": {
+              "type": "boolean",
+              "title": "autocorrelation",
+              "default": true,
+              "description": "Create autocorrelation plots for all stations"
+            },
+            "crosscorrelation": {
+              "type": "boolean",
+              "title": "crosscorrelation",
+              "default": true,
+              "description": "Create crosscorrelation plots for all baselines"
+            }
+          },
+          "description": "Create dynamic spectrum plots",
+          "additionalProperties": false
+        },
+        "file_conversion": {
+          "type": "object",
+          "title": "File Conversion",
+          "default": {},
+          "required": [
+            "enabled",
+            "nr_of_subbands",
+            "nr_of_timestamps"
+          ],
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "enabled",
+              "default": true,
+              "description": "Do/Don't create a QA file for the observation"
+            },
+            "nr_of_subbands": {
+              "type": "integer",
+              "title": "#subbands",
+              "default": -1,
+              "description": "Keep this number of subbands from the observation in the QA file, or all if -1"
+            },
+            "nr_of_timestamps": {
+              "type": "integer",
+              "title": "#timestamps",
+              "default": 256,
+              "minimum": 1,
+              "description": "Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)"
+            }
+          },
+          "description": "Create a QA file for the observation",
+          "additionalProperties": false
+        }
+      },
+      "description": "Perform all Quality Assurance (QA) tasks, including file conversion and plotting.",
+      "additionalProperties": false
     },
     "SAPs": {
       "type": "array",
-      "title": "SAPs",
-      "description": "Station beams",
-      "additionalItems": false,
-      "default": [
-        {}
-      ],
       "items": {
-        "title": "SAP",
-        "headerTemplate": "{{ i0 }} - {{ self.name }}",
         "type": "object",
-        "additionalProperties": false,
+        "title": "SAP",
         "default": {},
+        "required": [
+          "digital_pointing",
+          "subbands"
+        ],
         "properties": {
           "name": {
             "type": "string",
             "title": "Name/target",
-            "description": "Identifier for this beam",
-            "default": ""
-          },
-          "digital_pointing": {
-            "title": "Digital pointing",
-            "default": {},
-            "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
+            "default": "",
+            "description": "Identifier for this beam"
           },
           "subbands": {
             "type": "array",
-            "title": "Subband list",
-            "additionalItems": false,
-            "default": [],
             "items": {
               "type": "integer",
               "title": "Subband",
-              "minimum": 0,
-              "maximum": 511
-            }
+              "maximum": 511,
+              "minimum": 0
+            },
+            "title": "Subband list",
+            "default": [],
+            "additionalItems": false
+          },
+          "digital_pointing": {
+            "type": "object",
+            "required": [
+              "angle1",
+              "angle2"
+            ],
+            "properties": {
+              "angle1": {
+                "type": "number",
+                "title": "Angle 1",
+                "default": 0,
+                "description": "First angle (e.g. RA)"
+              },
+              "angle2": {
+                "type": "number",
+                "title": "Angle 2",
+                "default": 0,
+                "description": "Second angle (e.g. DEC)"
+              },
+              "angle3": {
+                "type": "number",
+                "title": "Angle 3",
+                "default": 0,
+                "description": "Third angle (e.g. N in LMN)"
+              },
+              "direction_type": {
+                "enum": [
+                  "J2000",
+                  "AZELGEO",
+                  "LMN",
+                  "SUN",
+                  "MOON",
+                  "MERCURY",
+                  "VENUS",
+                  "MARS",
+                  "JUPITER",
+                  "SATURN",
+                  "URANUS",
+                  "NEPTUNE",
+                  "PLUTO"
+                ],
+                "type": "string",
+                "title": "Reference frame",
+                "default": "J2000",
+                "description": ""
+              }
+            },
+            "additionalProperties": false
           }
         },
-        "required": [
-          "digital_pointing",
-          "subbands"
-        ]
-      }
+        "headerTemplate": "{{ i0 }} - {{ self.name }}",
+        "additionalProperties": false
+      },
+      "title": "SAPs",
+      "default": [
+        {}
+      ],
+      "description": "Station beams",
+      "additionalItems": false
+    },
+    "filter": {
+      "enum": [
+        "LBA_10_70",
+        "LBA_30_70",
+        "LBA_10_90",
+        "LBA_30_90",
+        "HBA_110_190",
+        "HBA_210_250"
+      ],
+      "type": "string",
+      "title": "Band-pass filter",
+      "default": "HBA_110_190",
+      "description": "Must match antenna type"
     },
     "duration": {
       "type": "number",
       "title": "Duration (seconds)",
-      "description": "Duration of this observation",
       "default": 300,
-      "minimum": 1
+      "minimum": 1,
+      "description": "Duration of this observation"
+    },
+    "stations": {
+      "type": "array",
+      "items": {
+        "enum": [
+          "CS001",
+          "CS002",
+          "CS003",
+          "CS004",
+          "CS005",
+          "CS006",
+          "CS007",
+          "CS011",
+          "CS013",
+          "CS017",
+          "CS021",
+          "CS024",
+          "CS026",
+          "CS028",
+          "CS030",
+          "CS031",
+          "CS032",
+          "CS101",
+          "CS103",
+          "CS201",
+          "CS301",
+          "CS302",
+          "CS401",
+          "CS501",
+          "RS104",
+          "RS106",
+          "RS205",
+          "RS208",
+          "RS210",
+          "RS305",
+          "RS306",
+          "RS307",
+          "RS310",
+          "RS406",
+          "RS407",
+          "RS409",
+          "RS410",
+          "RS503",
+          "RS508",
+          "RS509",
+          "DE601",
+          "DE602",
+          "DE603",
+          "DE604",
+          "DE605",
+          "FR606",
+          "SE607",
+          "UK608",
+          "DE609",
+          "PL610",
+          "PL611",
+          "PL612",
+          "IE613",
+          "LV614"
+        ],
+        "type": "string",
+        "title": "Station",
+        "description": ""
+      },
+      "title": "fixed station list",
+      "default": [
+        "CS001"
+      ],
+      "minItems": 1,
+      "uniqueItems": true,
+      "additionalItems": false,
+      "additionalProperties": false
+    },
+    "tile_beam": {
+      "type": "object",
+      "required": [
+        "angle1",
+        "angle2"
+      ],
+      "properties": {
+        "angle1": {
+          "type": "number",
+          "title": "Angle 1",
+          "default": 0,
+          "description": "First angle (e.g. RA)"
+        },
+        "angle2": {
+          "type": "number",
+          "title": "Angle 2",
+          "default": 0,
+          "description": "Second angle (e.g. DEC)"
+        },
+        "angle3": {
+          "type": "number",
+          "title": "Angle 3",
+          "default": 0,
+          "description": "Third angle (e.g. N in LMN)"
+        },
+        "direction_type": {
+          "enum": [
+            "J2000",
+            "AZELGEO",
+            "LMN",
+            "SUN",
+            "MOON",
+            "MERCURY",
+            "VENUS",
+            "MARS",
+            "JUPITER",
+            "SATURN",
+            "URANUS",
+            "NEPTUNE",
+            "PLUTO"
+          ],
+          "type": "string",
+          "title": "Reference frame",
+          "default": "J2000",
+          "description": ""
+        }
+      },
+      "additionalProperties": false
     },
     "correlator": {
-      "title": "Correlator Settings",
       "type": "object",
-      "additionalProperties": false,
+      "title": "Correlator Settings",
       "default": {},
+      "required": [
+        "channels_per_subband",
+        "integration_time",
+        "storage_cluster"
+      ],
       "properties": {
+        "storage_cluster": {
+          "enum": [
+            "CEP4",
+            "DragNet"
+          ],
+          "type": "string",
+          "title": "Storage cluster",
+          "default": "CEP4",
+          "description": "Cluster to write output to"
+        },
+        "integration_time": {
+          "type": "number",
+          "title": "Integration time (seconds)",
+          "default": 1,
+          "minimum": 0.1,
+          "description": "Desired integration period"
+        },
         "channels_per_subband": {
-          "type": "integer",
-          "title": "Channels/subband",
-          "description": "Number of frequency bands per subband",
-          "default": 64,
-          "minimum": 8,
           "enum": [
             8,
             16,
@@ -97,43 +359,35 @@
             256,
             512,
             1024
-          ]
-        },
-        "integration_time": {
-          "type": "number",
-          "title": "Integration time (seconds)",
-          "description": "Desired integration period",
-          "default": 1,
-          "minimum": 0.1
-        },
-        "storage_cluster": {
-          "type": "string",
-          "title": "Storage cluster",
-          "description": "Cluster to write output to",
-          "default": "CEP4",
-          "enum": [
-            "CEP4",
-            "DragNet"
-          ]
+          ],
+          "type": "integer",
+          "title": "Channels/subband",
+          "default": 64,
+          "minimum": 8,
+          "description": "Number of frequency bands per subband"
         }
       },
-      "required": [
-        "channels_per_subband",
-        "integration_time",
-        "storage_cluster"
-      ]
+      "additionalProperties": false
     },
-    "QA": {
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1/#/definitions/QA",
-      "default": {}
+    "antenna_set": {
+      "enum": [
+        "HBA_DUAL",
+        "HBA_DUAL_INNER",
+        "HBA_ONE",
+        "HBA_ONE_INNER",
+        "HBA_ZERO",
+        "HBA_ZERO_INNER",
+        "LBA_INNER",
+        "LBA_OUTER",
+        "LBA_SPARSE_EVEN",
+        "LBA_SPARSE_ODD",
+        "LBA_ALL"
+      ],
+      "type": "string",
+      "title": "Antenna set",
+      "default": "HBA_DUAL",
+      "description": "Fields & antennas to use"
     }
   },
-  "required": [
-    "stations",
-    "antenna_set",
-    "filter",
-    "SAPs",
-    "duration",
-    "correlator"
-  ]
+  "description": "This schema defines the parameters to setup a target observation task."
 }
\ No newline at end of file