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 a023ce3c2a30ddb590e83aad0c244b49702d7dc2..9025b5254498dc54b958cf9a6b13c1f6496a52fb 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
@@ -74,19 +74,74 @@
       "description":"Perform all Quality Assurance (QA) tasks, including file conversion and plotting.",
       "default":{},
       "properties": {
-        "file_conversion" : {
-          "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/file_conversion",
-          "default": {}
+    "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,
+      "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"
         },
-        "plots" : {
-          "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/plots",
-          "default": {}
+        "crosscorrelation":{
+          "type":"boolean",
+          "title":"crosscorrelation",
+          "default":true,
+          "description":"Create crosscorrelation plots for all baselines"
         }
       },
       "additionalProperties":false,
+      "required": [
+        "enabled",
+        "autocorrelation",
+        "crosscorrelation"]
+    }        }
+      },
+      "additionalProperties":false,
       "required": [
         "file_conversion",
         "plots"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json b/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json
index 6c598b18722f2600f4a0019fe4603fc505a21de1..1a4024296bc351dd07b13b80b22973d1d08f1a9b 100644
--- a/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json
+++ b/SAS/TMSS/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json
@@ -1,22 +1,207 @@
 {
-  "$id":"http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#",
+  "$id": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/stations/1#",
+  "type": "object",
+  "title": "stations",
   "$schema": "http://json-schema.org/draft-06/schema#",
-  "title":"stations",
-  "description":"This schema provives a definitions for the LOFAR stations and their antenna sets and filters",
-  "version":"1",
-  "type":"object",
-  "definitions":{
-    "station_list":{
-      "title":"fixed station list",
-      "default":[
-        "CS001"
+  "version": 1,
+  "definitions": {
+    "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"
+    },
+    "stations": {
+      "oneOf": [
+        {
+          "type": "object",
+          "items": {
+            "type": "object",
+            "title": "Station set",
+            "required": [
+              "group",
+              "min_stations"
+            ],
+            "properties": {
+              "group": {
+                "enum": [
+                  "ALL",
+                  "SUPERTERP",
+                  "CORE",
+                  "REMOTE",
+                  "DUTCH",
+                  "INTERNATIONAL"
+                ],
+                "type": "string",
+                "title": "Group/station",
+                "default": "ALL",
+                "description": "Which (group of) station(s) to select from"
+              },
+              "min_stations": {
+                "type": "integer",
+                "title": "Minimum nr of stations",
+                "default": 1,
+                "minimum": 0,
+                "description": "Number of stations to use within group/station"
+              }
+            },
+            "headerTemplate": "{{ self.group }}",
+            "additionalProperties": false
+          },
+          "title": "dynamic station set",
+          "default": {},
+          "additionalItems": false
+        },
+        {
+          "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
+        }
+      ],
+      "title": "stations",
+      "default": {
+        "group": "ALL",
+        "min_stations": 1
+      },
+      "description": "Use either the fixed station list, or one of the dynamic station sets."
+    },
+    "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":"array",
-      "additionalItems":false,
-      "additionalProperties":false,
-      "items":{
-        "type":"string",
-        "enum":[
+      "type": "string",
+      "title": "Antenna set",
+      "default": "HBA_DUAL",
+      "description": "Fields & antennas to use"
+    },
+    "station_set": {
+      "type": "object",
+      "items": {
+        "type": "object",
+        "title": "Station set",
+        "required": [
+          "group",
+          "min_stations"
+        ],
+        "properties": {
+          "group": {
+            "enum": [
+              "ALL",
+              "SUPERTERP",
+              "CORE",
+              "REMOTE",
+              "DUTCH",
+              "INTERNATIONAL"
+            ],
+            "type": "string",
+            "title": "Group/station",
+            "default": "ALL",
+            "description": "Which (group of) station(s) to select from"
+          },
+          "min_stations": {
+            "type": "integer",
+            "title": "Minimum nr of stations",
+            "default": 1,
+            "minimum": 0,
+            "description": "Number of stations to use within group/station"
+          }
+        },
+        "headerTemplate": "{{ self.group }}",
+        "additionalProperties": false
+      },
+      "title": "dynamic station set",
+      "default": {},
+      "additionalItems": false
+    },
+    "station_list": {
+      "type": "array",
+      "items": {
+        "enum": [
           "CS001",
           "CS002",
           "CS003",
@@ -72,98 +257,19 @@
           "IE613",
           "LV614"
         ],
-        "title":"Station",
-        "description":""
+        "type": "string",
+        "title": "Station",
+        "description": ""
       },
-      "minItems":1,
-      "uniqueItems":true
-    },
-    "station_set":{
-      "title":"dynamic station set",
-      "type":"object",
-      "default":{},
-      "additionalItems":false,
-      "items":{
-        "type":"object",
-        "title":"Station set",
-        "headerTemplate":"{{ self.group }}",
-        "additionalProperties":false,
-        "properties":{
-          "group":{
-            "type":"string",
-            "title":"Group/station",
-            "description":"Which (group of) station(s) to select from",
-            "default":"ALL",
-            "enum":[
-              "ALL",
-              "SUPERTERP",
-              "CORE",
-              "REMOTE",
-              "DUTCH",
-              "INTERNATIONAL"
-            ]
-          },
-          "min_stations":{
-            "type":"integer",
-            "title":"Minimum nr of stations",
-            "description":"Number of stations to use within group/station",
-            "default":1,
-            "minimum":0
-          }
-        },
-        "required":[
-          "group",
-          "min_stations"
-        ]
-      }
-    },
-    "stations": {
-      "title":"stations",
-      "description":"Use either the fixed station list, or one of the dynamic station sets.",
-      "oneOf": [ {
-          "$ref": "#/definitions/station_list"
-        },
-        {
-          "$ref": "#/definitions/station_set"
-        }
+      "title": "fixed station list",
+      "default": [
+        "CS001"
       ],
-      "default": {
-        "group": "ALL",
-        "min_stations": 1
-      }
-    },
-    "antenna_set":{
-      "type":"string",
-      "title":"Antenna set",
-      "description":"Fields & antennas to use",
-      "default":"HBA_DUAL",
-      "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"
-      ]
-    },
-    "filter":{
-      "type":"string",
-      "title":"Band-pass filter",
-      "description":"Must match antenna type",
-      "default":"HBA_110_190",
-      "enum":[
-        "LBA_10_70",
-        "LBA_30_70",
-        "LBA_10_90",
-        "LBA_30_90",
-        "HBA_110_190",
-        "HBA_210_250"
-      ]
+      "minItems": 1,
+      "uniqueItems": true,
+      "additionalItems": false,
+      "additionalProperties": false
     }
-  }
-}
\ No newline at end of file
+  },
+  "description": "This schema provives a definitions for the LOFAR stations and their antenna sets and filters"
+}