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..8459dd455b9b8bf7c39ac04cc6dc6a62e1211ab2 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
@@ -7,7 +7,15 @@
   "type": "object",
   "properties": {
     "stations": {
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/stations",
+      "title":"stations",
+      "description":"Use either the fixed station list, or one of the dynamic station sets.",
+      "oneOf": [ {
+          "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list"
+        },
+        {
+          "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_set"
+        }
+      ],
       "default": ["CS001"]
     },
     "antenna_set": {
@@ -124,8 +132,24 @@
       ]
     },
     "QA": {
-      "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1/#/definitions/QA",
-      "default": {}
+      "type":"object",
+      "title":"QA",
+      "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": {}
+        },
+        "plots" : {
+          "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/plots",
+          "default": {}
+        }
+      },
+      "additionalProperties":false,
+      "required": [
+        "file_conversion",
+        "plots"]
     }
   },
   "required": [