diff --git a/models/feeds-api-model/feeds_2021-06-30.json b/models/feeds-api-model/feeds_2021-06-30.json
index fc8bca0..0200b9b 100644
--- a/models/feeds-api-model/feeds_2021-06-30.json
+++ b/models/feeds-api-model/feeds_2021-06-30.json
@@ -146,17 +146,18 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedTypes": {
-                      "value": [
-                        "POST_PRODUCT_DATA"
-                      ]
-                    },
-                    "pageSize": {
-                      "value": 10
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedTypes": {
+                        "value": [
+                          "POST_PRODUCT_DATA"
+                        ]
+                      },
+                      "pageSize": {
+                        "value": 10
                     },
                     "processingStatuses": {
                       "value": [
@@ -179,8 +180,9 @@
                   ],
                   "nextToken": "VGhpcyB0b2tlbiBpcyBvcGFxdWUgYW5kIGludGVudGlvbmFsbHkgb2JmdXNjYXRlZA=="
                 }
-              }
-            ]
+                }
+              ]
+            }
           },
           "400": {
             "description": "Request has missing or invalid parameters and cannot be parsed.",
@@ -197,34 +199,36 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedTypes": {
-                      "value": [
-                        "POST_PRODUCT_DATA"
-                      ]
-                    },
-                    "processingStatuses": {
-                      "value": [
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedTypes": {
+                        "value": [
+                          "POST_PRODUCT_DATA"
+                        ]
+                      },
+                      "processingStatuses": {
+                        "value": [
                         "BAD_VALUE",
                         "DONE"
                       ]
                     }
                   }
                 },
-                "response": {
-                  "errors": [
-                    {
-                      "code": "400",
-                      "message": "Invalid input",
-                      "details": "Dates were not provided"
-                    }
-                  ]
+                  "response": {
+                    "errors": [
+                      {
+                        "code": "400",
+                        "message": "Invalid input",
+                        "details": "Dates were not provided"
+                      }
+                    ]
+                  }
                 }
-              }
-            ]
+              ]
+            }
           },
           "401": {
             "description": "The request's Authorization header is not formatted correctly or does not contain a valid token.",
@@ -368,27 +372,29 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "body": {
-                      "value": {
-                        "feedType": "POST_PRODUCT_DATA",
-                        "marketplaceIds": [
-                          "ATVPDKIKX0DER",
-                          "A1F83G8C2ARO7P"
-                        ],
-                        "inputFeedDocumentId": "3d4e42b5-1d6e-44e8-a89c-2abfca0625bb"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "body": {
+                        "value": {
+                          "feedType": "POST_PRODUCT_DATA",
+                          "marketplaceIds": [
+                            "ATVPDKIKX0DER",
+                            "A1F83G8C2ARO7P"
+                          ],
+                          "inputFeedDocumentId": "3d4e42b5-1d6e-44e8-a89c-2abfca0625bb"
+                        }
                       }
                     }
+                  },
+                  "response": {
+                    "feedId": "3485934"
                   }
-                },
-                "response": {
-                  "feedId": "3485934"
                 }
-              }
-            ]
+              ]
+            }
           },
           "400": {
             "description": "Request has missing or invalid parameters and cannot be parsed.",
@@ -405,32 +411,34 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "body": {
-                      "value": {
-                        "marketplaceIds": [
-                          "ATVPDKIKX0DER",
-                          "A1F83G8C2ARO7P"
-                        ],
-                        "inputFeedDocumentId": "badDocumentId"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "body": {
+                        "value": {
+                          "marketplaceIds": [
+                            "ATVPDKIKX0DER",
+                            "A1F83G8C2ARO7P"
+                          ],
+                          "inputFeedDocumentId": "badDocumentId"
                       }
                     }
                   }
                 },
-                "response": {
-                  "errors": [
-                    {
-                      "code": "400",
-                      "message": "Invalid input",
-                      "details": "Invalid input"
-                    }
-                  ]
+                  "response": {
+                    "errors": [
+                      {
+                        "code": "400",
+                        "message": "Invalid input",
+                        "details": "Invalid input"
+                      }
+                    ]
+                  }
                 }
-              }
-            ]
+              ]
+            }
           },
           "401": {
             "description": "The request's Authorization header is not formatted correctly or does not contain a valid token.",
@@ -573,17 +581,19 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedId": {
-                      "value": "ID1"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedId": {
+                        "value": "ID1"
+                      }
                     }
                   }
                 }
-              }
-            ]
+              ]
+            }
           },
           "400": {
             "description": "Request has missing or invalid parameters and cannot be parsed.",
@@ -600,26 +610,28 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedId": {
-                      "value": "BADID1"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedId": {
+                        "value": "BADID1"
+                      }
                     }
+                  },
+                  "response": {
+                    "errors": [
+                      {
+                        "code": "400",
+                        "message": "Invalid input",
+                        "details": "Invalid input"
+                      }
+                    ]
                   }
-                },
-                "response": {
-                  "errors": [
-                    {
-                      "code": "400",
-                      "message": "Invalid input",
-                      "details": "Invalid input"
-                    }
-                  ]
                 }
-              }
-            ]
+              ]
+            }
           },
           "401": {
             "description": "The request's Authorization header is not formatted correctly or does not contain a valid token.",
@@ -762,25 +774,27 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedId": {
-                      "value": "feedId1"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedId": {
+                        "value": "feedId1"
+                      }
                     }
+                  },
+                  "response": {
+                    "feedId": "FeedId1",
+                    "feedType": "POST_PRODUCT_DATA",
+                    "createdTime": "2019-12-11T13:16:24.630Z",
+                    "processingStatus": "CANCELLED",
+                    "processingStartTime": "2019-12-11T13:16:24.630Z",
+                    "processingEndTime": "2019-12-11T13:16:24.630Z"
                   }
-                },
-                "response": {
-                  "feedId": "FeedId1",
-                  "feedType": "POST_PRODUCT_DATA",
-                  "createdTime": "2019-12-11T13:16:24.630Z",
-                  "processingStatus": "CANCELLED",
-                  "processingStartTime": "2019-12-11T13:16:24.630Z",
-                  "processingEndTime": "2019-12-11T13:16:24.630Z"
                 }
-              }
-            ]
+              ]
+            }
           },
           "400": {
             "description": "Request has missing or invalid parameters and cannot be parsed.",
@@ -797,26 +811,28 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedId": {
-                      "value": "badFeedId1"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedId": {
+                        "value": "badFeedId1"
+                      }
                     }
+                  },
+                  "response": {
+                    "errors": [
+                      {
+                        "code": "400",
+                        "message": "Invalid input",
+                        "details": "Invalid input"
+                      }
+                    ]
                   }
-                },
-                "response": {
-                  "errors": [
-                    {
-                      "code": "400",
-                      "message": "Invalid input",
-                      "details": "Invalid input"
-                    }
-                  ]
                 }
-              }
-            ]
+              ]
+            }
           },
           "401": {
             "description": "The request's Authorization header is not formatted correctly or does not contain a valid token.",
@@ -963,23 +979,25 @@
             "schema": {
               "$ref": "#/definitions/CreateFeedDocumentResponse"
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "body": {
-                      "value": {
-                        "contentType": "text/tab-separated-values; charset=UTF-8"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "body": {
+                        "value": {
+                          "contentType": "text/tab-separated-values; charset=UTF-8"
+                        }
                       }
                     }
+                  },
+                  "response": {
+                    "feedDocumentId": "3d4e42b5-1d6e-44e8-a89c-2abfca0625bb",
+                    "url": "https://d34o8swod1owfl.cloudfront.net/Feed_101__POST_PRODUCT_DATA_.xml"
                   }
-                },
-                "response": {
-                  "feedDocumentId": "3d4e42b5-1d6e-44e8-a89c-2abfca0625bb",
-                  "url": "https://d34o8swod1owfl.cloudfront.net/Feed_101__POST_PRODUCT_DATA_.xml"
                 }
-              }
-            ]
+              ]
+            }
           },
           "400": {
             "description": "Request has missing or invalid parameters and cannot be parsed.",
@@ -996,26 +1014,28 @@
             "schema": {
               "$ref": "#/definitions/ErrorList"
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "body": {
-                      "value": {}
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "body": {
+                        "value": {}
+                      }
                     }
+                  },
+                  "response": {
+                    "errors": [
+                      {
+                        "code": "400",
+                        "message": "Invalid input",
+                        "details": "Invalid input"
+                      }
+                    ]
                   }
-                },
-                "response": {
-                  "errors": [
-                    {
-                      "code": "400",
-                      "message": "Invalid input",
-                      "details": "Invalid input"
-                    }
-                  ]
                 }
-              }
-            ]
+              ]
+            }
           },
           "403": {
             "description": "Indicates that access to the resource is forbidden. Possible reasons include Access Denied, Unauthorized, Expired Token, or Invalid Signature.",
@@ -1161,21 +1181,23 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedDocumentId": {
-                      "value": "0356cf79-b8b0-4226-b4b9-0ee058ea5760"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedDocumentId": {
+                        "value": "0356cf79-b8b0-4226-b4b9-0ee058ea5760"
+                      }
                     }
+                  },
+                  "response": {
+                    "feedDocumentId": "0356cf79-b8b0-4226-b4b9-0ee058ea5760",
+                    "url": "https://d34o8swod1owfl.cloudfront.net/Feed_101__POST_PRODUCT_DATA_.xml"
                   }
-                },
-                "response": {
-                  "feedDocumentId": "0356cf79-b8b0-4226-b4b9-0ee058ea5760",
-                  "url": "https://d34o8swod1owfl.cloudfront.net/Feed_101__POST_PRODUCT_DATA_.xml"
                 }
-              }
-            ]
+              ]
+            }
           },
           "400": {
             "description": "Request has missing or invalid parameters and cannot be parsed.",
@@ -1192,26 +1214,28 @@
                 "description": "Unique request reference ID."
               }
             },
-            "x-amazon-spds-sandbox-behaviors": [
-              {
-                "request": {
-                  "parameters": {
-                    "feedDocumentId": {
-                      "value": "badDocumentId1"
+            "x-amzn-api-sandbox": {
+              "static": [
+                {
+                  "request": {
+                    "parameters": {
+                      "feedDocumentId": {
+                        "value": "badDocumentId1"
+                      }
                     }
+                  },
+                  "response": {
+                    "errors": [
+                      {
+                        "code": "400",
+                        "message": "Invalid input",
+                        "details": "Invalid input"
+                      }
+                    ]
                   }
-                },
-                "response": {
-                  "errors": [
-                    {
-                      "code": "400",
-                      "message": "Invalid input",
-                      "details": "Invalid input"
-                    }
-                  ]
                 }
-              }
-            ]
+              ]
+            }
           },
           "401": {
             "description": "The request's Authorization header is not formatted correctly or does not contain a valid token.",