diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index 9bdf22a1d9fda05ef692919712240d409c2ea1e6..cbfe13a12f8ca3f61d261a1d3519f821c14454af 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -31,8 +31,9 @@
               "message_type":{
                  "description":"Type of message",
                  "example":"acknowledgement",
-                 "type":"string"
-              },
+                 "type":"string",
+                 "enum": ["acknowledgement"]
+               },
               "platform_ID":{
                  "description":"Unique identifier for this platform",
                  "example":"reav-x-1",
@@ -107,7 +108,8 @@
               "message_type":{
                  "description":"Type of message",
                  "example":"mission_plan",
-                 "type":"string"
+                 "type":"string",
+                 "enum": ["mission_plan"]
               },
               "plan":{
                  "items":{
@@ -202,7 +204,8 @@
               "message_type":{
                  "description":"Type of message",
                  "example":"observation",
-                 "type":"string"
+                 "type":"string",
+                 "enum": ["observation"]
               },
               "platform_ID":{
                  "description":"Unique identifier for this platform",
@@ -319,7 +322,8 @@
               "message_type":{
                  "description":"Type of message",
                  "example":"planning_configuration",
-                 "type":"string"
+                 "type":"string",
+                 "enum": ["planning_configuration"]
               },
               "planning_config_ID":{
                  "description":"Unique identifier tagged to version of this configuration plan",
@@ -351,7 +355,8 @@
                                          "description":"Any addition fields/data to be added here",
                                          "example":{
                                             
-                                         }
+                                         },
+                                         "type":"object"
                                       },
                                       "safe_command":{
                                          "description":"Command/Action that is native to respective partner's platform/C2",
@@ -569,7 +574,8 @@
               "message_type":{
                  "description":"Type of message",
                  "example":"platform_status",
-                 "type":"string"
+                 "type":"string",
+                 "enum": ["platform_status"]
               },
               "mission_plan_ID":{
                  "description":"Mission plan ID according to platform-C2 system",