diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index 46a2b91c0b4212c803052283e73bf8344d14ab78..99672c8becbef3db5d2aae585a7a13fd96bfa3db 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -1183,6 +1183,122 @@
         "title": "GeoJSON LineString",
         "type": "object"
       },
+      "geojson.org.schema.MultiLineString.json": {
+        "$id": "https://geojson.org/schema/MultiLineString.json",
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "properties": {
+          "bbox": {
+            "items": {
+              "type": "number"
+            },
+            "minItems": 4,
+            "type": "array"
+          },
+          "coordinates": {
+            "items": {
+              "items": {
+                "items": {
+                  "type": "number"
+                },
+                "minItems": 2,
+                "type": "array"
+              },
+              "minItems": 2,
+              "type": "array"
+            },
+            "type": "array"
+          },
+          "type": {
+            "enum": [
+              "MultiLineString"
+            ],
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "coordinates"
+        ],
+        "title": "GeoJSON MultiLineString",
+        "type": "object"
+      },
+      "geojson.org.schema.MultiPoint.json": {
+        "$id": "https://geojson.org/schema/MultiPoint.json",
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "properties": {
+          "bbox": {
+            "items": {
+              "type": "number"
+            },
+            "minItems": 4,
+            "type": "array"
+          },
+          "coordinates": {
+            "items": {
+              "items": {
+                "type": "number"
+              },
+              "minItems": 2,
+              "type": "array"
+            },
+            "type": "array"
+          },
+          "type": {
+            "enum": [
+              "MultiPoint"
+            ],
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "coordinates"
+        ],
+        "title": "GeoJSON MultiPoint",
+        "type": "object"
+      },
+      "geojson.org.schema.MultiPolygon.json": {
+        "$id": "https://geojson.org/schema/MultiPolygon.json",
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "properties": {
+          "bbox": {
+            "items": {
+              "type": "number"
+            },
+            "minItems": 4,
+            "type": "array"
+          },
+          "coordinates": {
+            "items": {
+              "items": {
+                "items": {
+                  "items": {
+                    "type": "number"
+                  },
+                  "minItems": 2,
+                  "type": "array"
+                },
+                "minItems": 4,
+                "type": "array"
+              },
+              "type": "array"
+            },
+            "type": "array"
+          },
+          "type": {
+            "enum": [
+              "MultiPolygon"
+            ],
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "coordinates"
+        ],
+        "title": "GeoJSON MultiPolygon",
+        "type": "object"
+      },
       "geojson.org.schema.Point.json": {
         "$id": "https://geojson.org/schema/Point.json",
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -1611,13 +1727,7 @@
           "exclusion_zones": {
             "description": "Exclusion zones for all platforms",
             "items": {
-              "description": "GeoJSON Polygon",
-              "properties": {
-                "geometry": {
-                  "$ref": "#/components/schemas/geojson.org.schema.Polygon.json"
-                }
-              },
-              "type": "object"
+              "$ref": "#/components/schemas/geojson.org.schema.Polygon.json"
             },
             "type": "array"
           },
@@ -1637,13 +1747,7 @@
           "region_of_interest": {
             "description": "Region of interest for the entire operation",
             "items": {
-              "description": "GeoJSON Polygon",
-              "properties": {
-                "geometry": {
-                  "$ref": "#/components/schemas/geojson.org.schema.Polygon.json"
-                }
-              },
-              "type": "object"
+              "$ref": "#/components/schemas/geojson.org.schema.Polygon.json"
             },
             "type": "array"
           },
@@ -1690,29 +1794,12 @@
                             "example": "go_home",
                             "type": "string"
                           },
-                          "target_depth": {
-                            "description": "Z-coordinate safe place for respective platform . If platform to NOT stay at depth, key in `0.0`",
-                            "example": 10.0,
-                            "format": "float",
-                            "type": "number"
-                          },
-                          "target_waypoint_latitude": {
-                            "description": "Y-coordinate safe place for respective platform",
-                            "example": 50.365,
-                            "format": "float",
-                            "type": "number"
-                          },
-                          "target_waypoint_longitude": {
-                            "description": "X-coordinate safe place for respective platform",
-                            "example": -7.432,
-                            "format": "float",
-                            "type": "number"
+                          "target_waypoint": {
+                            "$ref": "#/components/schemas/geojson.org.schema.Point.json"
                           }
                         },
                         "required": [
-                          "target_waypoint_latitude",
-                          "target_waypoint_longitude",
-                          "target_depth"
+                          "target_waypoint"
                         ],
                         "type": "object"
                       },