diff --git a/examples/autonomy_engine_adapter/planning_configuration.json b/examples/autonomy_engine_adapter/planning_configuration.json
index 005fca7bee95eac72a3769a5292d72c6c21e766a..fccf3344292e6c70a4c202c9dd1d2689c6f6b56b 100644
--- a/examples/autonomy_engine_adapter/planning_configuration.json
+++ b/examples/autonomy_engine_adapter/planning_configuration.json
@@ -4,7 +4,7 @@
     "timestamp": "2022-11-16T00:00:00Z",
     "version": 2,
     "source": "gui",
-    "destination": "soar.all.all.all.from_platform.planning_configuration",
+    "destination": "",
     "delivery_type": "broadcast",
     "encoded": false
   },
@@ -13,58 +13,64 @@
     "planning_config_ID": 1,
     "exclusion_zones": [
       {
-        "geometry_coordinates": [
-          [
+        "geometry": {
+          "type": "Polygon", 
+          "coordinates": [
             [
-              -4.1777839187560915,
-              50.34173405662855
-            ],
-            [
-              -4.1777839187560915,
-              50.33820949229701
-            ],
-            [
-              -4.143667777943875,
-              50.33820949229701
-            ],
-            [
-              -4.143667777943875,
-              50.34173405662855
-            ],
-            [
-              -4.1777839187560915,
-              50.34173405662855
+              [
+                -4.1777839187560915,
+                50.34173405662855
+              ],
+              [
+                -4.1777839187560915,
+                50.33820949229701
+              ],
+              [
+                -4.143667777943875,
+                50.33820949229701
+              ],
+              [
+                -4.143667777943875,
+                50.34173405662855
+              ],
+              [
+                -4.1777839187560915,
+                50.34173405662855
+              ]
             ]
           ]
-        ]
+        }
       }
     ],
     "region_of_interest": [
       {
-        "geometry_coordinates": [
-          [
+        "geometry": {
+          "type": "Polygon", 
+          "coordinates": [
             [
-              -4.1777839187560915,
-              50.34173405662855
-            ],
-            [
-              -4.1777839187560915,
-              50.33820949229701
-            ],
-            [
-              -4.143667777943875,
-              50.33820949229701
-            ],
-            [
-              -4.143667777943875,
-              50.34173405662855
-            ],
-            [
-              -4.1777839187560915,
-              50.34173405662855
+              [
+                -4.1777839187560915,
+                50.34173405662855
+              ],
+              [
+                -4.1777839187560915,
+                50.33820949229701
+              ],
+              [
+                -4.143667777943875,
+                50.33820949229701
+              ],
+              [
+                -4.143667777943875,
+                50.34173405662855
+              ],
+              [
+                -4.1777839187560915,
+                50.34173405662855
+              ]
             ]
           ]
-        ]
+        }
       }
     ],   
     "squads": [
diff --git a/examples/gui_adapter/planning_configuration.json b/examples/gui_adapter/planning_configuration.json
index 9c04569473fd56579e6e0bdf565ee88702aba341..5ce2216b7fdeabbbc140e5ee7577f789a89e90eb 100644
--- a/examples/gui_adapter/planning_configuration.json
+++ b/examples/gui_adapter/planning_configuration.json
@@ -4,8 +4,8 @@
     "timestamp": "2022-11-16T00:00:00Z",
     "version": 2,
     "source": "gui",
-    "destination": "soar.all.all.all.from_platform.planning_configuration",
-    "delivery_type": "publish",
+    "destination": "",
+    "delivery_type": "broadcast",
     "encoded": false
   },
   "payload":{
@@ -13,7 +13,8 @@
     "planning_config_ID": 1,
     "exclusion_zones": [
       {
-        "geometry_coordinates": [
+        "type": "Polygon", 
+        "coordinates": [
           [
             [
               -4.1777839187560915,
@@ -41,7 +42,8 @@
     ],
     "region_of_interest": [
       {
-        "geometry_coordinates": [
+        "type": "Polygon", 
+        "coordinates": [
           [
             [
               -4.1777839187560915,
diff --git a/formats/planning_configuration.py b/formats/planning_configuration.py
index a2260f78dc86109d0b6d9e377ca7c4aa97fdb684..96074d9109a0387e01d9ffac53d015777c3a7665 100644
--- a/formats/planning_configuration.py
+++ b/formats/planning_configuration.py
@@ -13,30 +13,12 @@ emergency_schema = {
             + " partner's platform/C2",
             "example": "go_home",
         },
-        "target_waypoint_latitude": {
-            "type": "number",
-            "format": "float",
-            "description": "Y-coordinate safe place for respective platform",
-            "example": 50.365,
-        },
-        "target_waypoint_longitude": {
-            "type": "number",
-            "format": "float",
-            "description": "X-coordinate safe place for respective platform",
-            "example": -7.432,
-        },
-        "target_depth": {
-            "type": "number",
-            "format": "float",
-            "description": "Z-coordinate safe place for respective platform"
-            + " . If platform to NOT stay at depth, key in `0.0`",
-            "example": 10.0,
-        },
+        "target_waypoint": {
+            "$ref": "https://geojson.org/schema/Point.json",
+        }
     },
     "required": [
-        "target_waypoint_latitude",
-        "target_waypoint_longitude",
-        "target_depth",
+        "target_waypoint",
     ],
 }
 
@@ -181,16 +163,6 @@ platform_schema = {
     ],
 }
 
-region_schema = {
-    "type": "object",
-    "properties": {
-        "geometry": {
-            "$ref": "https://geojson.org/schema/Polygon.json",
-        },
-    },
-    "description": "GeoJSON Polygon",
-}
-
 squad_metadata_schema = {
     "type": "object",
     "properties": {
@@ -242,12 +214,16 @@ planning_configuration_schema = {
         },
         "region_of_interest": {
             "type": "array",
-            "items": region_schema,
+            "items": {
+              "$ref": "https://geojson.org/schema/Polygon.json",
+            },
             "description": "Region of interest for the entire operation",
         },
         "exclusion_zones": {
             "type": "array",
-            "items": region_schema,
+            "items": {
+              "$ref": "https://geojson.org/schema/Polygon.json",
+            },
             "description": "Exclusion zones for all platforms",
         },
         "squads": {