diff --git a/demo/openapi.yaml b/demo/openapi.yaml
index 4dc5f229..558c4080 100644
--- a/demo/openapi.yaml
+++ b/demo/openapi.yaml
@@ -253,6 +253,11 @@ paths:
         date range or specific query parameter (marked by <b>*</b> below) is
         provided, the order results will be limited to the last two years.
       operationId: GetTnOptionOrders
+      x-badges:
+        - name: 1st Badge
+          type: warning
+        - name: 2nd Badge
+          type: experimental
       parameters:
         - description: The status of the TN Option order being searched for.
           example: PROCESSING
diff --git a/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap b/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
index e5608f39..75158076 100644
--- a/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
+++ b/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
@@ -134,6 +134,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "light": "#eb6d6b",
                           "main": "#d41f1c",
                         },
+                        "experimental": Object {
+                          "contrastText": "#fff",
+                          "dark": "#540297",
+                          "light": "#ba68fd",
+                          "main": "#8c03fc",
+                        },
+                        "global": Object {
+                          "contrastText": "#fff",
+                          "dark": "#4d02b0",
+                          "light": "#b681fd",
+                          "main": "#7c1cfc",
+                        },
                         "gray": Object {
                           "100": "#F5F5F5",
                           "50": "#FAFAFA",
@@ -188,6 +200,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "secondary": "#666",
                         },
                         "tonalOffset": 0.2,
+                        "usonly": Object {
+                          "contrastText": "#fff",
+                          "dark": "#045b8b",
+                          "light": "#61c4fa",
+                          "main": "#079cee",
+                        },
                         "warning": Object {
                           "contrastText": "#ffffff",
                           "dark": "#996300",
@@ -405,6 +423,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "light": "#eb6d6b",
                           "main": "#d41f1c",
                         },
+                        "experimental": Object {
+                          "contrastText": "#fff",
+                          "dark": "#540297",
+                          "light": "#ba68fd",
+                          "main": "#8c03fc",
+                        },
+                        "global": Object {
+                          "contrastText": "#fff",
+                          "dark": "#4d02b0",
+                          "light": "#b681fd",
+                          "main": "#7c1cfc",
+                        },
                         "gray": Object {
                           "100": "#F5F5F5",
                           "50": "#FAFAFA",
@@ -459,6 +489,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "secondary": "#666",
                         },
                         "tonalOffset": 0.2,
+                        "usonly": Object {
+                          "contrastText": "#fff",
+                          "dark": "#045b8b",
+                          "light": "#61c4fa",
+                          "main": "#079cee",
+                        },
                         "warning": Object {
                           "contrastText": "#ffffff",
                           "dark": "#996300",
@@ -663,6 +699,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "light": "#eb6d6b",
                     "main": "#d41f1c",
                   },
+                  "experimental": Object {
+                    "contrastText": "#fff",
+                    "dark": "#540297",
+                    "light": "#ba68fd",
+                    "main": "#8c03fc",
+                  },
+                  "global": Object {
+                    "contrastText": "#fff",
+                    "dark": "#4d02b0",
+                    "light": "#b681fd",
+                    "main": "#7c1cfc",
+                  },
                   "gray": Object {
                     "100": "#F5F5F5",
                     "50": "#FAFAFA",
@@ -717,6 +765,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "secondary": "#666",
                   },
                   "tonalOffset": 0.2,
+                  "usonly": Object {
+                    "contrastText": "#fff",
+                    "dark": "#045b8b",
+                    "light": "#61c4fa",
+                    "main": "#079cee",
+                  },
                   "warning": Object {
                     "contrastText": "#ffffff",
                     "dark": "#996300",
@@ -983,6 +1037,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "light": "#eb6d6b",
                           "main": "#d41f1c",
                         },
+                        "experimental": Object {
+                          "contrastText": "#fff",
+                          "dark": "#540297",
+                          "light": "#ba68fd",
+                          "main": "#8c03fc",
+                        },
+                        "global": Object {
+                          "contrastText": "#fff",
+                          "dark": "#4d02b0",
+                          "light": "#b681fd",
+                          "main": "#7c1cfc",
+                        },
                         "gray": Object {
                           "100": "#F5F5F5",
                           "50": "#FAFAFA",
@@ -1037,6 +1103,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "secondary": "#666",
                         },
                         "tonalOffset": 0.2,
+                        "usonly": Object {
+                          "contrastText": "#fff",
+                          "dark": "#045b8b",
+                          "light": "#61c4fa",
+                          "main": "#079cee",
+                        },
                         "warning": Object {
                           "contrastText": "#ffffff",
                           "dark": "#996300",
@@ -1266,6 +1338,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "light": "#eb6d6b",
                           "main": "#d41f1c",
                         },
+                        "experimental": Object {
+                          "contrastText": "#fff",
+                          "dark": "#540297",
+                          "light": "#ba68fd",
+                          "main": "#8c03fc",
+                        },
+                        "global": Object {
+                          "contrastText": "#fff",
+                          "dark": "#4d02b0",
+                          "light": "#b681fd",
+                          "main": "#7c1cfc",
+                        },
                         "gray": Object {
                           "100": "#F5F5F5",
                           "50": "#FAFAFA",
@@ -1320,6 +1404,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                           "secondary": "#666",
                         },
                         "tonalOffset": 0.2,
+                        "usonly": Object {
+                          "contrastText": "#fff",
+                          "dark": "#045b8b",
+                          "light": "#61c4fa",
+                          "main": "#079cee",
+                        },
                         "warning": Object {
                           "contrastText": "#ffffff",
                           "dark": "#996300",
@@ -1520,6 +1610,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "light": "#eb6d6b",
                     "main": "#d41f1c",
                   },
+                  "experimental": Object {
+                    "contrastText": "#fff",
+                    "dark": "#540297",
+                    "light": "#ba68fd",
+                    "main": "#8c03fc",
+                  },
+                  "global": Object {
+                    "contrastText": "#fff",
+                    "dark": "#4d02b0",
+                    "light": "#b681fd",
+                    "main": "#7c1cfc",
+                  },
                   "gray": Object {
                     "100": "#F5F5F5",
                     "50": "#FAFAFA",
@@ -1574,6 +1676,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "secondary": "#666",
                   },
                   "tonalOffset": 0.2,
+                  "usonly": Object {
+                    "contrastText": "#fff",
+                    "dark": "#045b8b",
+                    "light": "#61c4fa",
+                    "main": "#079cee",
+                  },
                   "warning": Object {
                     "contrastText": "#ffffff",
                     "dark": "#996300",
@@ -1799,6 +1907,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                 "light": "#eb6d6b",
                 "main": "#d41f1c",
               },
+              "experimental": Object {
+                "contrastText": "#fff",
+                "dark": "#540297",
+                "light": "#ba68fd",
+                "main": "#8c03fc",
+              },
+              "global": Object {
+                "contrastText": "#fff",
+                "dark": "#4d02b0",
+                "light": "#b681fd",
+                "main": "#7c1cfc",
+              },
               "gray": Object {
                 "100": "#F5F5F5",
                 "50": "#FAFAFA",
@@ -1853,6 +1973,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                 "secondary": "#666",
               },
               "tonalOffset": 0.2,
+              "usonly": Object {
+                "contrastText": "#fff",
+                "dark": "#045b8b",
+                "light": "#61c4fa",
+                "main": "#079cee",
+              },
               "warning": Object {
                 "contrastText": "#ffffff",
                 "dark": "#996300",
@@ -2108,6 +2234,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "light": "#eb6d6b",
                     "main": "#d41f1c",
                   },
+                  "experimental": Object {
+                    "contrastText": "#fff",
+                    "dark": "#540297",
+                    "light": "#ba68fd",
+                    "main": "#8c03fc",
+                  },
+                  "global": Object {
+                    "contrastText": "#fff",
+                    "dark": "#4d02b0",
+                    "light": "#b681fd",
+                    "main": "#7c1cfc",
+                  },
                   "gray": Object {
                     "100": "#F5F5F5",
                     "50": "#FAFAFA",
@@ -2162,6 +2300,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "secondary": "#666",
                   },
                   "tonalOffset": 0.2,
+                  "usonly": Object {
+                    "contrastText": "#fff",
+                    "dark": "#045b8b",
+                    "light": "#61c4fa",
+                    "main": "#079cee",
+                  },
                   "warning": Object {
                     "contrastText": "#ffffff",
                     "dark": "#996300",
@@ -2379,6 +2523,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "light": "#eb6d6b",
                     "main": "#d41f1c",
                   },
+                  "experimental": Object {
+                    "contrastText": "#fff",
+                    "dark": "#540297",
+                    "light": "#ba68fd",
+                    "main": "#8c03fc",
+                  },
+                  "global": Object {
+                    "contrastText": "#fff",
+                    "dark": "#4d02b0",
+                    "light": "#b681fd",
+                    "main": "#7c1cfc",
+                  },
                   "gray": Object {
                     "100": "#F5F5F5",
                     "50": "#FAFAFA",
@@ -2433,6 +2589,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
                     "secondary": "#666",
                   },
                   "tonalOffset": 0.2,
+                  "usonly": Object {
+                    "contrastText": "#fff",
+                    "dark": "#045b8b",
+                    "light": "#61c4fa",
+                    "main": "#079cee",
+                  },
                   "warning": Object {
                     "contrastText": "#ffffff",
                     "dark": "#996300",
@@ -2637,6 +2799,18 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
               "light": "#eb6d6b",
               "main": "#d41f1c",
             },
+            "experimental": Object {
+              "contrastText": "#fff",
+              "dark": "#540297",
+              "light": "#ba68fd",
+              "main": "#8c03fc",
+            },
+            "global": Object {
+              "contrastText": "#fff",
+              "dark": "#4d02b0",
+              "light": "#b681fd",
+              "main": "#7c1cfc",
+            },
             "gray": Object {
               "100": "#F5F5F5",
               "50": "#FAFAFA",
@@ -2691,6 +2865,12 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
               "secondary": "#666",
             },
             "tonalOffset": 0.2,
+            "usonly": Object {
+              "contrastText": "#fff",
+              "dark": "#045b8b",
+              "light": "#61c4fa",
+              "main": "#079cee",
+            },
             "warning": Object {
               "contrastText": "#ffffff",
               "dark": "#996300",
diff --git a/src/utils/__tests__/__snapshots__/loadAndBundleSpec.test.ts.snap b/src/utils/__tests__/__snapshots__/loadAndBundleSpec.test.ts.snap
index c1618ad3..6f3fc77e 100644
--- a/src/utils/__tests__/__snapshots__/loadAndBundleSpec.test.ts.snap
+++ b/src/utils/__tests__/__snapshots__/loadAndBundleSpec.test.ts.snap
@@ -773,6 +773,16 @@ and standard method from web, mobile and desktop applications.
         "tags": Array [
           "Tn Option",
         ],
+        "x-badges": Array [
+          Object {
+            "name": "1st Badge",
+            "type": "warning",
+          },
+          Object {
+            "name": "2nd Badge",
+            "type": "experimental",
+          },
+        ],
       },
       "post": Object {
         "description": "Create TN Option order to assign line features to the telephone number.<br><br>Attribute description:<ul><li>for A2pSettings attribute</li><table style=\\"text-align: left; width: 80%;\\" border=\\"1\\" cellpadding=\\"2\\" cellspacing=\\"0\\"><tbody><tr><th>Number attribute</th><th>Action value</th><th>Description of action</th></tr><tr><td>LongCode</td><td><i>systemDefault</i></td><td>Removes the per-TN A2P attributes, and it reverts to the Location/SIP Peer characteristics. Any values for Class or Campaign ID are not valid</td></tr><tr><td>LongCode</td><td><i>asSpecified</i></td><td>Sets the message class and campaign ID - this is the default if unspecified</td></tr><tr><td>LongCode</td><td><i>off</i></td><td>Will set the TN as a 'P' TN. Any values for Class or Campaign ID are not valid</td></tr><tr><td>LongCode</td><td><i>delete</i></td><td>Will delete the campaign ID from TN. Any values for Class or Campaign ID are not valid</td></tr><tr><td>LongCode</td><td><i>unchanged</i></td><td>Do nothing with respect to A2P</td></tr><tr><td>TollFree</td><td><i>systemDefault</i></td><td>Removes the per-TN A2P attributes, and it reverts to the Location/SIP Peer characteristics. Any values for Class or Campaign ID are not valid</td></tr><tr><td>TollFree</td><td><i>asSpecified</i></td><td>Sets the message class and campaign ID - this is the default if unspecified</td></tr><tr><td>TollFree</td><td><i>off</i></td><td>If the Togglz value is set to 'on' this is invalid for Toll Free telephone numbers. Any values for Class or Campaign ID in the payload are invalid. If the Togglz value is set to off this behaves like and A2P TN, where the characteristics of the TNs is set to 'P'</td></tr><tr><td>TollFree</td><td><i>unchanged</i></td><td>Do nothing with respect to A2P</td></tr></tbody></table><li>for Origination Route plan attribute</li><table style=\\"text-align: left; width: 80%;\\" border=\\"1\\" cellpadding=\\"2\\" cellspacing=\\"0\\"><tbody><tr><th>Action value</th><th>Description of action</th></tr><tr><td>asSpecified</td><td>Creates/updates the origination route plan for the TN with route plan details provided in the request </td></tr><tr><td>off</td><td>Removes the origination route plan for the TN. Route list is the request must be empty</td></tr><tr><td>unchanged</td><td>Doesn't update/create the origination route plan, even when route plan details exist in the request</td></tr></tbody></table><ul><li> Origination route plan is validated against CallForward and RewriteUser</li><ul><li type=\\"square\\">Route plan and CallForward cannot co-exist. Order is accepted but will respond with error messages on GET.</li><li type=\\"square\\">Route plan and RewriteUser cannot co-exist. Order is accepted but will respond with error messages on GET.</li></ul></ul><li>for Pindrop Enabled attribute</li><table style=\\"text-align: left; width: 80%;\\" border=\\"1\\" cellpadding=\\"2\\" cellspacing=\\"0\\"><tbody><tr><th>Action value</th><th>Description of action</th></tr><tr><td>true</td><td>Enables Pindrop integration on each phone number in the option group</td></tr><tr><td>false</td><td>Explicitly disables Pindrop integration on each phone number in the option group</td></tr></tbody></table><li>for other attribute</li><ul><li type=\\"square\\"> <i>systemDefault</i> - implies that the element profile value should be removed so that the TN changes back to the default system behavior;</li><li type=\\"square\\"> <i>unchanged</i> - the value should remain unchanged - implies a read before write model.</li><li type=\\"square\\"><u>Leaving the element out of the payload is equivalent to <i>unchanged</i>.</u></li></ul></ul>",
@@ -1095,6 +1105,12 @@ and standard method from web, mobile and desktop applications.
         "tags": Array [
           "Tn Option",
         ],
+        "x-badges": Array [
+          Object {
+            "name": "Success",
+            "type": "success",
+          },
+        ],
       },
     },
     "/pet": Object {
@@ -1144,6 +1160,12 @@ and standard method from web, mobile and desktop applications.
         "tags": Array [
           "pet",
         ],
+        "x-badges": Array [
+          Object {
+            "name": "Global",
+            "type": "global",
+          },
+        ],
         "x-codeSamples": Array [
           Object {
             "lang": "C#",
@@ -1208,6 +1230,12 @@ try {
         "tags": Array [
           "pet",
         ],
+        "x-badges": Array [
+          Object {
+            "name": "US Only",
+            "type": "usonly",
+          },
+        ],
         "x-codeSamples": Array [
           Object {
             "lang": "PHP",