From fa45a77124e726af8d19abcc00c5ee0a3bd9778b Mon Sep 17 00:00:00 2001
From: Charles Treatman <ctreatman@equinix.com>
Date: Wed, 12 Feb 2025 09:48:12 -0600
Subject: [PATCH] chore: upgrade openapi-generator to v7.10.0 (#87)

---
 .gitignore                                    |   1 +
 Makefile                                      |   2 +-
 Makefile.metalv1                              |  19 ++-
 go.mod                                        |   5 +-
 go.sum                                        |   6 +-
 services/eiav2/README.md                      |   2 +-
 services/eiav2/client.go                      |  28 ++--
 .../model_customer_route_ipv4_request.go      |   2 +-
 .../model_customer_route_ipv6_request.go      |   2 +-
 .../model_direct_peering_ipv4_request.go      |   2 +-
 .../model_direct_peering_ipv6_request.go      |   2 +-
 services/eiav2/model_error.go                 |   2 +-
 ...el_routing_protocol_customer_route_ipv4.go |   2 +-
 ...el_routing_protocol_customer_route_ipv6.go |   2 +-
 .../model_routing_protocol_peering_ipv4.go    |   4 +-
 .../model_routing_protocol_peering_ipv6.go    |   4 +-
 ...service_request_all_of_routing_protocol.go |   7 +
 services/eiav2/utils.go                       |  14 ++
 services/fabricv4/README.md                   |   2 +-
 services/fabricv4/api_cloud_routers.go        |  10 +-
 services/fabricv4/api_connections.go          |   4 +-
 services/fabricv4/api_metros.go               |   6 +-
 services/fabricv4/api_networks.go             |   2 +-
 services/fabricv4/api_ports.go                |   2 +-
 .../fabricv4/api_route_aggregation_rules.go   |   8 +-
 services/fabricv4/api_route_aggregations.go   |   4 +-
 services/fabricv4/api_route_filter_rules.go   |   8 +-
 services/fabricv4/api_route_filters.go        |   4 +-
 services/fabricv4/api_routing_protocols.go    |  12 +-
 services/fabricv4/api_service_profiles.go     |  18 +-
 services/fabricv4/api_service_tokens.go       |  10 +-
 services/fabricv4/api_statistics.go           |  10 +-
 services/fabricv4/api_stream_subscriptions.go |   4 +-
 services/fabricv4/api_streams.go              |   8 +-
 services/fabricv4/client.go                   |  28 ++--
 services/fabricv4/docs/BulkPortRequest.md     |   2 +-
 services/fabricv4/model_error.go              |   2 +-
 .../fabricv4/model_json_patch_operation.go    |  19 ++-
 .../fabricv4/model_routing_protocol_base.go   |  13 +-
 .../fabricv4/model_routing_protocol_data.go   |  13 +-
 ...model_service_profile_access_point_type.go |  13 +-
 services/fabricv4/utils.go                    |  14 ++
 services/metalv1/README.md                    |   6 +-
 services/metalv1/api_authentication.go        |  10 +-
 services/metalv1/api_batches.go               |   6 +-
 services/metalv1/api_bgp.go                   |   6 +-
 services/metalv1/api_devices.go               | 111 +++++++------
 services/metalv1/api_events.go                |  68 ++++----
 services/metalv1/api_facilities.go            |  29 +++-
 services/metalv1/api_firmware_sets.go         |   8 +-
 services/metalv1/api_hardware_reservations.go |  26 +--
 services/metalv1/api_incidents.go             |   4 +-
 services/metalv1/api_interconnections.go      |  52 +++---
 services/metalv1/api_invitations.go           |   4 +-
 services/metalv1/api_invoices.go              |   6 +-
 services/metalv1/api_ip_addresses.go          |  33 ++--
 services/metalv1/api_licenses.go              |  20 +--
 services/metalv1/api_memberships.go           |   4 +-
 services/metalv1/api_metal_gateways.go        |  40 ++---
 services/metalv1/api_organizations.go         |  62 +++----
 services/metalv1/api_password_reset_tokens.go |   2 +-
 services/metalv1/api_payment_methods.go       |   4 +-
 services/metalv1/api_plans.go                 |  23 ++-
 services/metalv1/api_ports.go                 |  49 ++++--
 services/metalv1/api_projects.go              |  40 ++---
 .../metalv1/api_self_service_reservations.go  |  15 +-
 services/metalv1/api_spot_market.go           |  22 +--
 services/metalv1/api_ssh_keys.go              |  20 +--
 services/metalv1/api_transfer_requests.go     |   2 +-
 services/metalv1/api_two_factor_auth.go       |   4 +-
 services/metalv1/api_usages.go                |   8 +-
 .../metalv1/api_user_verification_tokens.go   |   6 +-
 services/metalv1/api_userdata.go              |   2 +-
 services/metalv1/api_users.go                 |  30 ++--
 services/metalv1/api_vlans.go                 |  24 +--
 services/metalv1/api_vrfs.go                  |  87 +++++++---
 services/metalv1/client.go                    |  28 ++--
 services/metalv1/docs/DeviceCreateInput.md    |   2 +-
 services/metalv1/docs/FacilitiesApi.md        |   4 +-
 .../InstancesBatchCreateInputBatchesInner.md  |   2 +-
 services/metalv1/docs/PortsApi.md             |   8 +-
 services/metalv1/model_aws_fabric_provider.go |   2 +-
 .../metalv1/model_bgp_config_request_input.go |   2 +-
 .../metalv1/model_create_device_request.go    |  13 +-
 .../model_create_metal_gateway_request.go     |  13 +-
 ...te_organization_interconnection_request.go |  31 +++-
 ...odel_find_ip_address_by_id_200_response.go |  19 ++-
 ...l_find_metal_gateway_by_id_200_response.go |  13 +-
 .../model_interconnection_fabric_provider.go  |   7 +-
 ...del_request_ip_reservation_201_response.go |  13 +-
 .../model_request_ip_reservation_request.go   |  13 +-
 services/metalv1/model_virtual_circuit.go     |  13 +-
 .../model_virtual_circuit_create_input.go     |  13 +-
 .../model_virtual_circuit_update_input.go     |  13 +-
 ...connection_create_input_fabric_provider.go |   7 +-
 .../model_vrf_virtual_circuit_create_input.go |   2 +-
 .../model_vrf_virtual_circuit_update_input.go |   2 +-
 services/metalv1/utils.go                     |  14 ++
 templates/services/eiav2/client.mustache      |  28 ++--
 templates/services/eiav2/model_oneof.mustache | 154 ++++++++++++++++++
 templates/services/fabricv4/client.mustache   |  28 ++--
 templates/services/metalv1/api.mustache       |  20 +--
 templates/services/metalv1/client.mustache    |  28 ++--
 103 files changed, 1046 insertions(+), 601 deletions(-)
 create mode 100644 templates/services/eiav2/model_oneof.mustache

diff --git a/.gitignore b/.gitignore
index d2233614..92f4e2db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ services/*/api/
 pkg
 .certs
 .idea/
+spec/services/metalv1/temp_merged_spec/
diff --git a/Makefile b/Makefile
index a5cf468b..4388d542 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ GIT_REPO=equinix-sdk-go
 PACKAGE_VERSION=$(shell cat version)
 USER_AGENT=${GIT_REPO}/${PACKAGE_VERSION}
 
-OPENAPI_IMAGE_TAG=v7.4.0
+OPENAPI_IMAGE_TAG=v7.10.0
 OPENAPI_IMAGE=openapitools/openapi-generator-cli:${OPENAPI_IMAGE_TAG}
 CRI=docker # nerdctl
 CRI_COMMAND_BASE=${CRI} run --rm -u ${CURRENT_UID}:${CURRENT_GID} $(DOCKER_EXTRA_ARGS)
diff --git a/Makefile.metalv1 b/Makefile.metalv1
index 72258acd..9719add3 100644
--- a/Makefile.metalv1
+++ b/Makefile.metalv1
@@ -40,6 +40,20 @@ clean:
 	rm -rf $(CODE_DIR)
 
 codegen:
+	# TODO: fetch the merged (single-file) spec
+	# instead of merging it here
+	# *NOTE*: Due to a bug in swagger-parser, we have
+	# to use v7.4.0 of openapi-generator to merge the
+	# spec in order to avoid introducing duplicate models
+	${CRI} run --rm -u ${CURRENT_UID}:${CURRENT_GID} \
+	    -v $(CURDIR):/local \
+		openapitools/openapi-generator-cli:v7.4.0 \
+		generate \
+		-i /local/${SPEC_PATCHED_DIR}/${SPEC_ROOT_FILE} \
+		-g openapi-yaml \
+		-p skipOperationExample=true -p outputFile=${SPEC_ROOT_FILE} \
+		-o /local/${SPEC_BASE_DIR}/${PACKAGE_NAME}/temp_merged_spec
+
 	${OPENAPI_GENERATOR} generate -g go \
 		--package-name ${PACKAGE_NAME} \
 		--http-user-agent "${USER_AGENT}" \
@@ -49,8 +63,9 @@ codegen:
 		-c /local/config/openapi-generator.json \
 		-t /local/${TEMPLATE_DIR} \
 		-o /local/${CODE_DIR} \
-		-i /local/${SPEC_PATCHED_DIR}/${SPEC_ROOT_FILE}
-
+		-i /local/${SPEC_BASE_DIR}/${PACKAGE_NAME}/temp_merged_spec/${SPEC_ROOT_FILE}
+        # -i /local/${SPEC_PATCHED_DIR}/${SPEC_ROOT_FILE} # switch back to this when the temporary merged spec is removed
+		
 validate:
 	${OPENAPI_GENERATOR} validate \
 		--recommend \
diff --git a/go.mod b/go.mod
index e3cc82b1..f83ed5bb 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,10 @@ module github.com/equinix/equinix-sdk-go
 
 go 1.19
 
-require github.com/stretchr/testify v1.10.0
+require (
+	github.com/stretchr/testify v1.10.0
+	gopkg.in/validator.v2 v2.0.1
+)
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index 713a0b4f..621094c7 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,14 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/validator.v2 v2.0.1 h1:xF0KWyGWXm/LM2G1TrEjqOu4pa6coO9AlWSf3msVfDY=
+gopkg.in/validator.v2 v2.0.1/go.mod h1:lIUZBlB3Im4s/eYp39Ry/wkR02yOPhZ9IwIRBjuPuG8=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/services/eiav2/README.md b/services/eiav2/README.md
index 285b3208..55798295 100644
--- a/services/eiav2/README.md
+++ b/services/eiav2/README.md
@@ -7,7 +7,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
 
 - API version: 2.0
 - Package version: 0.48.0
-- Generator version: 7.4.0
+- Generator version: 7.10.0
 - Build package: org.openapitools.codegen.languages.GoClientCodegen
 For more information, please visit [https://equinix.com/about/](https://equinix.com/about/)
 
diff --git a/services/eiav2/client.go b/services/eiav2/client.go
index 2280dc08..808c5870 100644
--- a/services/eiav2/client.go
+++ b/services/eiav2/client.go
@@ -141,7 +141,7 @@ func parameterValueToString(obj interface{}, key string) string {
 
 // parameterAddToHeaderOrQuery adds the provided object to the request header or url query
 // supporting deep object syntax
-func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, style string, collectionType string) {
 	var v = reflect.ValueOf(obj)
 	var value = ""
 	if v == reflect.ValueOf(nil) {
@@ -157,11 +157,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				if err != nil {
 					return
 				}
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, style, collectionType)
 				return
 			}
 			if t, ok := obj.(time.Time); ok {
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339Nano), style, collectionType)
 				return
 			}
 			value = v.Type().String() + " value"
@@ -173,7 +173,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 			var lenIndValue = indValue.Len()
 			for i := 0; i < lenIndValue; i++ {
 				var arrayValue = indValue.Index(i)
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, arrayValue.Interface(), collectionType)
+				var keyPrefixForCollectionType = keyPrefix
+				if style == "deepObject" {
+					keyPrefixForCollectionType = keyPrefix + "[" + strconv.Itoa(i) + "]"
+				}
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefixForCollectionType, arrayValue.Interface(), style, collectionType)
 			}
 			return
 
@@ -185,14 +189,14 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 			iter := indValue.MapRange()
 			for iter.Next() {
 				k, v := iter.Key(), iter.Value()
-				parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), style, collectionType)
 			}
 			return
 
 		case reflect.Interface:
 			fallthrough
 		case reflect.Ptr:
-			parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), collectionType)
+			parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), style, collectionType)
 			return
 
 		case reflect.Int, reflect.Int8, reflect.Int16,
@@ -497,18 +501,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 	return err
 }
 
-// Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) error {
-	return fmt.Errorf(format, a...)
-}
-
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
diff --git a/services/eiav2/model_customer_route_ipv4_request.go b/services/eiav2/model_customer_route_ipv4_request.go
index ade98b46..d73b0129 100644
--- a/services/eiav2/model_customer_route_ipv4_request.go
+++ b/services/eiav2/model_customer_route_ipv4_request.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &CustomerRouteIpv4Request{}
 type CustomerRouteIpv4Request struct {
 	IpBlock *IpBlockIpv4Request `json:"ipBlock,omitempty"`
 	// Subnet prefix
-	Prefix               *string `json:"prefix,omitempty"`
+	Prefix               *string `json:"prefix,omitempty" validate:"regexp=^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\\/[0-2]*\\\\d{1}|\\/3[0-2]){1}$"`
 	AdditionalProperties map[string]interface{}
 }
 
diff --git a/services/eiav2/model_customer_route_ipv6_request.go b/services/eiav2/model_customer_route_ipv6_request.go
index ecda467f..956c69c6 100644
--- a/services/eiav2/model_customer_route_ipv6_request.go
+++ b/services/eiav2/model_customer_route_ipv6_request.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &CustomerRouteIpv6Request{}
 type CustomerRouteIpv6Request struct {
 	IpBlock *IpBlockIpv6Request `json:"ipBlock,omitempty"`
 	// Subnet prefix
-	Prefix               *string `json:"prefix,omitempty"`
+	Prefix               *string `json:"prefix,omitempty" validate:"regexp=^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$"`
 	AdditionalProperties map[string]interface{}
 }
 
diff --git a/services/eiav2/model_direct_peering_ipv4_request.go b/services/eiav2/model_direct_peering_ipv4_request.go
index 9f89f2a7..bc8c9083 100644
--- a/services/eiav2/model_direct_peering_ipv4_request.go
+++ b/services/eiav2/model_direct_peering_ipv4_request.go
@@ -23,7 +23,7 @@ type DirectPeeringIpv4Request struct {
 	// Peering IP addresses in Version 4 (IPv4)
 	EquinixPeerIps []string `json:"equinixPeerIps,omitempty"`
 	// Virtual router group IP addresses in Version 4 (IPv4)
-	EquinixVRRPIp        *string `json:"equinixVRRPIp,omitempty"`
+	EquinixVRRPIp        *string `json:"equinixVRRPIp,omitempty" validate:"regexp=^(?:\\\\d{1,3}\\\\.){3}\\\\d{1,3}(?:\\/(?:[0-2]?[0-9]|3[0-2]))?$"`
 	AdditionalProperties map[string]interface{}
 }
 
diff --git a/services/eiav2/model_direct_peering_ipv6_request.go b/services/eiav2/model_direct_peering_ipv6_request.go
index f879848c..c577d438 100644
--- a/services/eiav2/model_direct_peering_ipv6_request.go
+++ b/services/eiav2/model_direct_peering_ipv6_request.go
@@ -23,7 +23,7 @@ type DirectPeeringIpv6Request struct {
 	// Peering IP addresses in Version 6 (IPv6)
 	EquinixPeerIps []string `json:"equinixPeerIps,omitempty"`
 	// Virtual router group IP addresses in Version 6 (IPv6)
-	EquinixVRRPIp        *string `json:"equinixVRRPIp,omitempty"`
+	EquinixVRRPIp        *string `json:"equinixVRRPIp,omitempty" validate:"regexp=^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(\\/(?:[6-9]|[1-5][0-9]|6[0-4]))?$"`
 	AdditionalProperties map[string]interface{}
 }
 
diff --git a/services/eiav2/model_error.go b/services/eiav2/model_error.go
index 46665283..b9ea55a5 100644
--- a/services/eiav2/model_error.go
+++ b/services/eiav2/model_error.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &Error{}
 // Error Error Response with details
 type Error struct {
 	// Error code
-	ErrorCode string `json:"errorCode"`
+	ErrorCode string `json:"errorCode" validate:"regexp=^EQ-\\\\d{7}$"`
 	// Error message
 	ErrorMessage string `json:"errorMessage"`
 	// Correlation ID identifying the request
diff --git a/services/eiav2/model_routing_protocol_customer_route_ipv4.go b/services/eiav2/model_routing_protocol_customer_route_ipv4.go
index 47d298ac..289e74c0 100644
--- a/services/eiav2/model_routing_protocol_customer_route_ipv4.go
+++ b/services/eiav2/model_routing_protocol_customer_route_ipv4.go
@@ -22,7 +22,7 @@ var _ MappedNullable = &RoutingProtocolCustomerRouteIpv4{}
 type RoutingProtocolCustomerRouteIpv4 struct {
 	ImportPolicy map[string]interface{} `json:"importPolicy"`
 	// Subnet prefix
-	Prefix *string `json:"prefix,omitempty"`
+	Prefix *string `json:"prefix,omitempty" validate:"regexp=^([01]?\\\\d\\\\d?|2[0-4]\\\\d|25[0-5])(?:\\\\.(?:[01]?\\\\d\\\\d?|2[0-4]\\\\d|25[0-5])){3}(?:\\/[0-2]\\\\d|\\/3[0-2])+$"`
 	// Determines the size of ip subnet
 	PrefixLength         int32             `json:"prefixLength"`
 	IpBlock              *IpBlockReadModel `json:"ipBlock,omitempty"`
diff --git a/services/eiav2/model_routing_protocol_customer_route_ipv6.go b/services/eiav2/model_routing_protocol_customer_route_ipv6.go
index 691bbd07..7301be48 100644
--- a/services/eiav2/model_routing_protocol_customer_route_ipv6.go
+++ b/services/eiav2/model_routing_protocol_customer_route_ipv6.go
@@ -22,7 +22,7 @@ var _ MappedNullable = &RoutingProtocolCustomerRouteIpv6{}
 type RoutingProtocolCustomerRouteIpv6 struct {
 	ImportPolicy map[string]interface{} `json:"importPolicy"`
 	// Subnet prefix
-	Prefix *string `json:"prefix,omitempty"`
+	Prefix *string `json:"prefix,omitempty" validate:"regexp=^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))$"`
 	// Determines the size of ip subnet
 	PrefixLength         int32             `json:"prefixLength"`
 	IpBlock              *IpBlockReadModel `json:"ipBlock,omitempty"`
diff --git a/services/eiav2/model_routing_protocol_peering_ipv4.go b/services/eiav2/model_routing_protocol_peering_ipv4.go
index cf3822db..80f60c8f 100644
--- a/services/eiav2/model_routing_protocol_peering_ipv4.go
+++ b/services/eiav2/model_routing_protocol_peering_ipv4.go
@@ -26,8 +26,8 @@ type RoutingProtocolPeeringIpv4 struct {
 	// Indicates if VRRP is enabled.
 	VrrpEnabled          bool     `json:"vrrpEnabled"`
 	EquinixPeerIps       []string `json:"equinixPeerIps"`
-	EquinixVRRPIp        *string  `json:"equinixVRRPIp,omitempty"`
-	CustomerVRRPIp       *string  `json:"customerVRRPIp,omitempty"`
+	EquinixVRRPIp        *string  `json:"equinixVRRPIp,omitempty" validate:"regexp=^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"`
+	CustomerVRRPIp       *string  `json:"customerVRRPIp,omitempty" validate:"regexp=^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"`
 	AdditionalProperties map[string]interface{}
 }
 
diff --git a/services/eiav2/model_routing_protocol_peering_ipv6.go b/services/eiav2/model_routing_protocol_peering_ipv6.go
index fcade153..655bee2d 100644
--- a/services/eiav2/model_routing_protocol_peering_ipv6.go
+++ b/services/eiav2/model_routing_protocol_peering_ipv6.go
@@ -26,8 +26,8 @@ type RoutingProtocolPeeringIpv6 struct {
 	// Indicates if VRRP is enabled.
 	VrrpEnabled          bool     `json:"vrrpEnabled"`
 	EquinixPeerIps       []string `json:"equinixPeerIps"`
-	EquinixVRRPIp        *string  `json:"equinixVRRPIp,omitempty"`
-	CustomerVRRPIp       *string  `json:"customerVRRPIp,omitempty"`
+	EquinixVRRPIp        *string  `json:"equinixVRRPIp,omitempty" validate:"regexp=^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$"`
+	CustomerVRRPIp       *string  `json:"customerVRRPIp,omitempty" validate:"regexp=^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$"`
 	AdditionalProperties map[string]interface{}
 }
 
diff --git a/services/eiav2/model_service_request_all_of_routing_protocol.go b/services/eiav2/model_service_request_all_of_routing_protocol.go
index f1d8df38..c08d9f67 100644
--- a/services/eiav2/model_service_request_all_of_routing_protocol.go
+++ b/services/eiav2/model_service_request_all_of_routing_protocol.go
@@ -13,6 +13,7 @@ package eiav2
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // ServiceRequestAllOfRoutingProtocol - struct for ServiceRequestAllOfRoutingProtocol
@@ -53,6 +54,12 @@ func (dst *ServiceRequestAllOfRoutingProtocol) UnmarshalJSON(data []byte) error
 		return fmt.Errorf("failed to unmarshal JSON into map for the discriminator lookup")
 	}
 
+	// TEMP: hack to avoid unused imports until this PR is merged/released:
+	// https://github.com/OpenAPITools/openapi-generator/pull/20497
+	if err = validator.Validate(jsonDict); err != nil {
+		// Do nothing
+	}
+
 	// check if the discriminator value is 'BGP'
 	if jsonDict["type"] == "BGP" {
 		// try to unmarshal JSON data into BgpRoutingProtocolRequest
diff --git a/services/eiav2/utils.go b/services/eiav2/utils.go
index a045a0b3..f7005ef7 100644
--- a/services/eiav2/utils.go
+++ b/services/eiav2/utils.go
@@ -11,7 +11,9 @@ Contact: api-support@equinix.com
 package eiav2
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 	"reflect"
 	"time"
 )
@@ -345,3 +347,15 @@ func IsNil(i interface{}) bool {
 type MappedNullable interface {
 	ToMap() (map[string]interface{}, error)
 }
+
+// A wrapper for strict JSON decoding
+func newStrictDecoder(data []byte) *json.Decoder {
+	dec := json.NewDecoder(bytes.NewBuffer(data))
+	dec.DisallowUnknownFields()
+	return dec
+}
+
+// Prevent trying to import "fmt"
+func reportError(format string, a ...interface{}) error {
+	return fmt.Errorf(format, a...)
+}
diff --git a/services/fabricv4/README.md b/services/fabricv4/README.md
index fd9cc977..3752078f 100644
--- a/services/fabricv4/README.md
+++ b/services/fabricv4/README.md
@@ -7,7 +7,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
 
 - API version: 4.19
 - Package version: 0.48.0
-- Generator version: 7.4.0
+- Generator version: 7.10.0
 - Build package: org.openapitools.codegen.languages.GoClientCodegen
 For more information, please visit [https://docs.equinix.com/api-support.htm](https://docs.equinix.com/api-support.htm)
 
diff --git a/services/fabricv4/api_cloud_routers.go b/services/fabricv4/api_cloud_routers.go
index eb448258..fce3e607 100644
--- a/services/fabricv4/api_cloud_routers.go
+++ b/services/fabricv4/api_cloud_routers.go
@@ -82,7 +82,7 @@ func (a *CloudRoutersApiService) CreateCloudRouterExecute(r ApiCreateCloudRouter
 	}
 
 	if r.dryRun != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "form", "")
 	} else {
 		var defaultValue bool = false
 		r.dryRun = &defaultValue
@@ -581,7 +581,7 @@ func (a *CloudRoutersApiService) GetCloudRouterActionsExecute(r ApiGetCloudRoute
 	localVarFormParams := url.Values{}
 
 	if r.state != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "state", r.state, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "state", r.state, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -764,7 +764,7 @@ func (a *CloudRoutersApiService) GetCloudRouterActionsByUuidExecute(r ApiGetClou
 	localVarFormParams := url.Values{}
 
 	if r.state != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "state", r.state, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "state", r.state, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1251,10 +1251,10 @@ func (a *CloudRoutersApiService) GetCloudRouterPackagesExecute(r ApiGetCloudRout
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_connections.go b/services/fabricv4/api_connections.go
index 68f173f7..19305324 100644
--- a/services/fabricv4/api_connections.go
+++ b/services/fabricv4/api_connections.go
@@ -82,7 +82,7 @@ func (a *ConnectionsApiService) CreateConnectionExecute(r ApiCreateConnectionReq
 	}
 
 	if r.dryRun != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "form", "")
 	} else {
 		var defaultValue bool = false
 		r.dryRun = &defaultValue
@@ -560,7 +560,7 @@ func (a *ConnectionsApiService) GetConnectionByUuidExecute(r ApiGetConnectionByU
 	localVarFormParams := url.Values{}
 
 	if r.direction != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "direction", r.direction, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "direction", r.direction, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_metros.go b/services/fabricv4/api_metros.go
index 227b9e90..80c7d584 100644
--- a/services/fabricv4/api_metros.go
+++ b/services/fabricv4/api_metros.go
@@ -223,13 +223,13 @@ func (a *MetrosApiService) GetMetrosExecute(r ApiGetMetrosRequest) (*MetroRespon
 	localVarFormParams := url.Values{}
 
 	if r.presence != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "presence", r.presence, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "presence", r.presence, "form", "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_networks.go b/services/fabricv4/api_networks.go
index 43eff660..f9d90504 100644
--- a/services/fabricv4/api_networks.go
+++ b/services/fabricv4/api_networks.go
@@ -82,7 +82,7 @@ func (a *NetworksApiService) CreateNetworkExecute(r ApiCreateNetworkRequest) (*N
 	}
 
 	if r.dryRun != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "form", "")
 	} else {
 		var defaultValue bool = false
 		r.dryRun = &defaultValue
diff --git a/services/fabricv4/api_ports.go b/services/fabricv4/api_ports.go
index 1e865eb3..10043dbe 100644
--- a/services/fabricv4/api_ports.go
+++ b/services/fabricv4/api_ports.go
@@ -735,7 +735,7 @@ func (a *PortsApiService) GetPortsExecute(r ApiGetPortsRequest) (*AllPortsRespon
 	localVarFormParams := url.Values{}
 
 	if r.name != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "name", r.name, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "name", r.name, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_route_aggregation_rules.go b/services/fabricv4/api_route_aggregation_rules.go
index 65e7d9c4..9c44dac5 100644
--- a/services/fabricv4/api_route_aggregation_rules.go
+++ b/services/fabricv4/api_route_aggregation_rules.go
@@ -960,10 +960,10 @@ func (a *RouteAggregationRulesApiService) GetRouteAggregationRuleChangesExecute(
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1138,10 +1138,10 @@ func (a *RouteAggregationRulesApiService) GetRouteAggregationRulesExecute(r ApiG
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_route_aggregations.go b/services/fabricv4/api_route_aggregations.go
index d1d2e110..7eb4a52c 100644
--- a/services/fabricv4/api_route_aggregations.go
+++ b/services/fabricv4/api_route_aggregations.go
@@ -1448,10 +1448,10 @@ func (a *RouteAggregationsApiService) GetRouteAggregationChangesExecute(r ApiGet
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_route_filter_rules.go b/services/fabricv4/api_route_filter_rules.go
index 214ddaad..aac19acb 100644
--- a/services/fabricv4/api_route_filter_rules.go
+++ b/services/fabricv4/api_route_filter_rules.go
@@ -960,10 +960,10 @@ func (a *RouteFilterRulesApiService) GetRouteFilterRuleChangesExecute(r ApiGetRo
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1138,10 +1138,10 @@ func (a *RouteFilterRulesApiService) GetRouteFilterRulesExecute(r ApiGetRouteFil
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_route_filters.go b/services/fabricv4/api_route_filters.go
index 63452a3c..01bf5569 100644
--- a/services/fabricv4/api_route_filters.go
+++ b/services/fabricv4/api_route_filters.go
@@ -1459,10 +1459,10 @@ func (a *RouteFiltersApiService) GetRouteFilterChangesExecute(r ApiGetRouteFilte
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_routing_protocols.go b/services/fabricv4/api_routing_protocols.go
index 0d9ef4b9..a892b1c5 100644
--- a/services/fabricv4/api_routing_protocols.go
+++ b/services/fabricv4/api_routing_protocols.go
@@ -621,10 +621,10 @@ func (a *RoutingProtocolsApiService) GetConnectionRoutingProtocolAllBgpActionsEx
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -983,10 +983,10 @@ func (a *RoutingProtocolsApiService) GetConnectionRoutingProtocolsExecute(r ApiG
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1497,10 +1497,10 @@ func (a *RoutingProtocolsApiService) GetConnectionRoutingProtocolsChangesExecute
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_service_profiles.go b/services/fabricv4/api_service_profiles.go
index 47293b89..a1248ca7 100644
--- a/services/fabricv4/api_service_profiles.go
+++ b/services/fabricv4/api_service_profiles.go
@@ -389,7 +389,7 @@ func (a *ServiceProfilesApiService) GetServiceProfileByUuidExecute(r ApiGetServi
 	localVarFormParams := url.Values{}
 
 	if r.viewPoint != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "form", "")
 	} else {
 		var defaultValue GetServiceProfilesViewPointParameter = "aSide"
 		r.viewPoint = &defaultValue
@@ -556,10 +556,10 @@ func (a *ServiceProfilesApiService) GetServiceProfileMetrosByUuidExecute(r ApiGe
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -726,13 +726,13 @@ func (a *ServiceProfilesApiService) GetServiceProfilesExecute(r ApiGetServicePro
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	if r.viewPoint != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "form", "")
 	} else {
 		var defaultValue GetServiceProfilesViewPointParameter = "aSide"
 		r.viewPoint = &defaultValue
@@ -920,7 +920,7 @@ func (a *ServiceProfilesApiService) PutServiceProfileByUuidExecute(r ApiPutServi
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	parameterAddToHeaderOrQuery(localVarHeaderParams, "If-Match", r.ifMatch, "")
+	parameterAddToHeaderOrQuery(localVarHeaderParams, "If-Match", r.ifMatch, "simple", "")
 	// body params
 	localVarPostBody = r.serviceProfileRequest
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
@@ -1077,7 +1077,7 @@ func (a *ServiceProfilesApiService) SearchServiceProfilesExecute(r ApiSearchServ
 	}
 
 	if r.viewPoint != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "form", "")
 	} else {
 		var defaultValue GetServiceProfilesViewPointParameter = "aSide"
 		r.viewPoint = &defaultValue
@@ -1256,7 +1256,7 @@ func (a *ServiceProfilesApiService) UpdateServiceProfileByUuidExecute(r ApiUpdat
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	parameterAddToHeaderOrQuery(localVarHeaderParams, "If-Match", r.ifMatch, "")
+	parameterAddToHeaderOrQuery(localVarHeaderParams, "If-Match", r.ifMatch, "simple", "")
 	// body params
 	localVarPostBody = r.jsonPatchOperation
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
diff --git a/services/fabricv4/api_service_tokens.go b/services/fabricv4/api_service_tokens.go
index cc5cf978..a8aaabc3 100644
--- a/services/fabricv4/api_service_tokens.go
+++ b/services/fabricv4/api_service_tokens.go
@@ -82,7 +82,7 @@ func (a *ServiceTokensApiService) CreateServiceTokenExecute(r ApiCreateServiceTo
 	}
 
 	if r.dryRun != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "dryRun", r.dryRun, "form", "")
 	} else {
 		var defaultValue bool = false
 		r.dryRun = &defaultValue
@@ -666,10 +666,10 @@ func (a *ServiceTokensApiService) GetServiceTokensExecute(r ApiGetServiceTokensR
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -805,10 +805,10 @@ func (a *ServiceTokensApiService) SearchServiceTokensExecute(r ApiSearchServiceT
 	}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/fabricv4/api_statistics.go b/services/fabricv4/api_statistics.go
index 536c8ea8..93e2fbc1 100644
--- a/services/fabricv4/api_statistics.go
+++ b/services/fabricv4/api_statistics.go
@@ -100,9 +100,9 @@ func (a *StatisticsApiService) GetConnectionStatsByPortUuidExecute(r ApiGetConne
 		return localVarReturnValue, nil, reportError("viewPoint is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "startDateTime", r.startDateTime, "")
-	parameterAddToHeaderOrQuery(localVarQueryParams, "endDateTime", r.endDateTime, "")
-	parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "startDateTime", r.startDateTime, "form", "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "endDateTime", r.endDateTime, "form", "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "viewPoint", r.viewPoint, "form", "")
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
 
@@ -248,8 +248,8 @@ func (a *StatisticsApiService) GetPortStatsByPortUuidExecute(r ApiGetPortStatsBy
 		return localVarReturnValue, nil, reportError("endDateTime is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "startDateTime", r.startDateTime, "")
-	parameterAddToHeaderOrQuery(localVarQueryParams, "endDateTime", r.endDateTime, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "startDateTime", r.startDateTime, "form", "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "endDateTime", r.endDateTime, "form", "")
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
 
diff --git a/services/fabricv4/api_stream_subscriptions.go b/services/fabricv4/api_stream_subscriptions.go
index a0434ea4..2969f58f 100644
--- a/services/fabricv4/api_stream_subscriptions.go
+++ b/services/fabricv4/api_stream_subscriptions.go
@@ -577,10 +577,10 @@ func (a *StreamSubscriptionsApiService) GetStreamSubscriptionsExecute(r ApiGetSt
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/fabricv4/api_streams.go b/services/fabricv4/api_streams.go
index 103df93e..7a291380 100644
--- a/services/fabricv4/api_streams.go
+++ b/services/fabricv4/api_streams.go
@@ -893,10 +893,10 @@ func (a *StreamsApiService) GetStreamsExecute(r ApiGetStreamsRequest) (*GetAllSt
 	localVarFormParams := url.Values{}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1065,10 +1065,10 @@ func (a *StreamsApiService) GetStreamsAssetsExecute(r ApiGetStreamsAssetsRequest
 	}
 
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "form", "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/fabricv4/client.go b/services/fabricv4/client.go
index 43d195d8..907418f8 100644
--- a/services/fabricv4/client.go
+++ b/services/fabricv4/client.go
@@ -192,7 +192,7 @@ func parameterValueToString(obj interface{}, key string) string {
 
 // parameterAddToHeaderOrQuery adds the provided object to the request header or url query
 // supporting deep object syntax
-func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, style string, collectionType string) {
 	var v = reflect.ValueOf(obj)
 	var value = ""
 	if v == reflect.ValueOf(nil) {
@@ -208,11 +208,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				if err != nil {
 					return
 				}
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, style, collectionType)
 				return
 			}
 			if t, ok := obj.(time.Time); ok {
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339Nano), style, collectionType)
 				return
 			}
 			value = v.Type().String() + " value"
@@ -224,7 +224,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 			var lenIndValue = indValue.Len()
 			for i := 0; i < lenIndValue; i++ {
 				var arrayValue = indValue.Index(i)
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, arrayValue.Interface(), collectionType)
+				var keyPrefixForCollectionType = keyPrefix
+				if style == "deepObject" {
+					keyPrefixForCollectionType = keyPrefix + "[" + strconv.Itoa(i) + "]"
+				}
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefixForCollectionType, arrayValue.Interface(), style, collectionType)
 			}
 			return
 
@@ -236,14 +240,14 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 			iter := indValue.MapRange()
 			for iter.Next() {
 				k, v := iter.Key(), iter.Value()
-				parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), style, collectionType)
 			}
 			return
 
 		case reflect.Interface:
 			fallthrough
 		case reflect.Ptr:
-			parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), collectionType)
+			parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), style, collectionType)
 			return
 
 		case reflect.Int, reflect.Int8, reflect.Int16,
@@ -548,18 +552,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 	return err
 }
 
-// Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) error {
-	return fmt.Errorf(format, a...)
-}
-
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
diff --git a/services/fabricv4/docs/BulkPortRequest.md b/services/fabricv4/docs/BulkPortRequest.md
index 46c9ce27..e6a69b04 100644
--- a/services/fabricv4/docs/BulkPortRequest.md
+++ b/services/fabricv4/docs/BulkPortRequest.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Data** | Pointer to [**[]PortRequest**](PortRequest.md) |  | [optional] 
+**Data** | Pointer to [**[]Port**](Port.md) |  | [optional] 
 
 ## Methods
 
diff --git a/services/fabricv4/model_error.go b/services/fabricv4/model_error.go
index 146f2549..22627132 100644
--- a/services/fabricv4/model_error.go
+++ b/services/fabricv4/model_error.go
@@ -17,7 +17,7 @@ var _ MappedNullable = &Error{}
 
 // Error Error Response with details
 type Error struct {
-	ErrorCode            string                     `json:"errorCode"`
+	ErrorCode            string                     `json:"errorCode" validate:"regexp=^EQ-\\\\d{7}$"`
 	ErrorMessage         string                     `json:"errorMessage"`
 	CorrelationId        *string                    `json:"correlationId,omitempty"`
 	Details              *string                    `json:"details,omitempty"`
diff --git a/services/fabricv4/model_json_patch_operation.go b/services/fabricv4/model_json_patch_operation.go
index 0262204c..5dfbf38e 100644
--- a/services/fabricv4/model_json_patch_operation.go
+++ b/services/fabricv4/model_json_patch_operation.go
@@ -10,6 +10,7 @@ package fabricv4
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // JsonPatchOperation - Service Profile Access Points
@@ -51,7 +52,11 @@ func (dst *JsonPatchOperation) UnmarshalJSON(data []byte) error {
 		if string(jsonAddOperation) == "{}" { // empty struct
 			dst.AddOperation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.AddOperation); err != nil {
+				dst.AddOperation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.AddOperation = nil
@@ -64,7 +69,11 @@ func (dst *JsonPatchOperation) UnmarshalJSON(data []byte) error {
 		if string(jsonRemoveOperation) == "{}" { // empty struct
 			dst.RemoveOperation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.RemoveOperation); err != nil {
+				dst.RemoveOperation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.RemoveOperation = nil
@@ -77,7 +86,11 @@ func (dst *JsonPatchOperation) UnmarshalJSON(data []byte) error {
 		if string(jsonReplaceOperation) == "{}" { // empty struct
 			dst.ReplaceOperation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.ReplaceOperation); err != nil {
+				dst.ReplaceOperation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.ReplaceOperation = nil
diff --git a/services/fabricv4/model_routing_protocol_base.go b/services/fabricv4/model_routing_protocol_base.go
index 43a3029c..dea654f5 100644
--- a/services/fabricv4/model_routing_protocol_base.go
+++ b/services/fabricv4/model_routing_protocol_base.go
@@ -10,6 +10,7 @@ package fabricv4
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // RoutingProtocolBase - struct for RoutingProtocolBase
@@ -43,7 +44,11 @@ func (dst *RoutingProtocolBase) UnmarshalJSON(data []byte) error {
 		if string(jsonRoutingProtocolBGPType) == "{}" { // empty struct
 			dst.RoutingProtocolBGPType = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.RoutingProtocolBGPType); err != nil {
+				dst.RoutingProtocolBGPType = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.RoutingProtocolBGPType = nil
@@ -56,7 +61,11 @@ func (dst *RoutingProtocolBase) UnmarshalJSON(data []byte) error {
 		if string(jsonRoutingProtocolDirectType) == "{}" { // empty struct
 			dst.RoutingProtocolDirectType = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.RoutingProtocolDirectType); err != nil {
+				dst.RoutingProtocolDirectType = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.RoutingProtocolDirectType = nil
diff --git a/services/fabricv4/model_routing_protocol_data.go b/services/fabricv4/model_routing_protocol_data.go
index 33291102..ec9dee73 100644
--- a/services/fabricv4/model_routing_protocol_data.go
+++ b/services/fabricv4/model_routing_protocol_data.go
@@ -10,6 +10,7 @@ package fabricv4
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // RoutingProtocolData - struct for RoutingProtocolData
@@ -43,7 +44,11 @@ func (dst *RoutingProtocolData) UnmarshalJSON(data []byte) error {
 		if string(jsonRoutingProtocolBGPData) == "{}" { // empty struct
 			dst.RoutingProtocolBGPData = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.RoutingProtocolBGPData); err != nil {
+				dst.RoutingProtocolBGPData = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.RoutingProtocolBGPData = nil
@@ -56,7 +61,11 @@ func (dst *RoutingProtocolData) UnmarshalJSON(data []byte) error {
 		if string(jsonRoutingProtocolDirectData) == "{}" { // empty struct
 			dst.RoutingProtocolDirectData = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.RoutingProtocolDirectData); err != nil {
+				dst.RoutingProtocolDirectData = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.RoutingProtocolDirectData = nil
diff --git a/services/fabricv4/model_service_profile_access_point_type.go b/services/fabricv4/model_service_profile_access_point_type.go
index 0085a127..590154c2 100644
--- a/services/fabricv4/model_service_profile_access_point_type.go
+++ b/services/fabricv4/model_service_profile_access_point_type.go
@@ -10,6 +10,7 @@ package fabricv4
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // ServiceProfileAccessPointType - Access Point Type
@@ -43,7 +44,11 @@ func (dst *ServiceProfileAccessPointType) UnmarshalJSON(data []byte) error {
 		if string(jsonServiceProfileAccessPointTypeCOLO) == "{}" { // empty struct
 			dst.ServiceProfileAccessPointTypeCOLO = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.ServiceProfileAccessPointTypeCOLO); err != nil {
+				dst.ServiceProfileAccessPointTypeCOLO = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.ServiceProfileAccessPointTypeCOLO = nil
@@ -56,7 +61,11 @@ func (dst *ServiceProfileAccessPointType) UnmarshalJSON(data []byte) error {
 		if string(jsonServiceProfileAccessPointTypeVD) == "{}" { // empty struct
 			dst.ServiceProfileAccessPointTypeVD = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.ServiceProfileAccessPointTypeVD); err != nil {
+				dst.ServiceProfileAccessPointTypeVD = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.ServiceProfileAccessPointTypeVD = nil
diff --git a/services/fabricv4/utils.go b/services/fabricv4/utils.go
index ed6ee3d8..c477ba1c 100644
--- a/services/fabricv4/utils.go
+++ b/services/fabricv4/utils.go
@@ -8,7 +8,9 @@ Equinix Fabric API v4
 package fabricv4
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 	"reflect"
 	"time"
 )
@@ -342,3 +344,15 @@ func IsNil(i interface{}) bool {
 type MappedNullable interface {
 	ToMap() (map[string]interface{}, error)
 }
+
+// A wrapper for strict JSON decoding
+func newStrictDecoder(data []byte) *json.Decoder {
+	dec := json.NewDecoder(bytes.NewBuffer(data))
+	dec.DisallowUnknownFields()
+	return dec
+}
+
+// Prevent trying to import "fmt"
+func reportError(format string, a ...interface{}) error {
+	return fmt.Errorf(format, a...)
+}
diff --git a/services/metalv1/README.md b/services/metalv1/README.md
index e806f21a..2f011466 100644
--- a/services/metalv1/README.md
+++ b/services/metalv1/README.md
@@ -88,7 +88,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
 
 - API version: 1.0.0
 - Package version: 0.48.0
-- Generator version: 7.4.0
+- Generator version: 7.10.0
 - Build package: org.openapitools.codegen.languages.GoClientCodegen
 
 ## Installation
@@ -712,7 +712,7 @@ Authentication schemes defined for the API:
 - **API key parameter name**: X-Auth-Token
 - **Location**: HTTP header
 
-Note, each API key must be added to a map of `map[string]APIKey` where the key is: X-Auth-Token and passed in as the auth context for each request.
+Note, each API key must be added to a map of `map[string]APIKey` where the key is: x_auth_token and passed in as the auth context for each request.
 
 Example
 
@@ -721,7 +721,7 @@ auth := context.WithValue(
 		context.Background(),
 		metalv1.ContextAPIKeys,
 		map[string]metalv1.APIKey{
-			"X-Auth-Token": {Key: "API_KEY_STRING"},
+			"x_auth_token": {Key: "API_KEY_STRING"},
 		},
 	)
 r, err := client.Service.Operation(auth, args)
diff --git a/services/metalv1/api_authentication.go b/services/metalv1/api_authentication.go
index eb6fdf37..c2ce317d 100644
--- a/services/metalv1/api_authentication.go
+++ b/services/metalv1/api_authentication.go
@@ -84,7 +84,7 @@ func (a *AuthenticationApiService) CreateAPIKeyExecute(r ApiCreateAPIKeyRequest)
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -256,7 +256,7 @@ func (a *AuthenticationApiService) CreateProjectAPIKeyExecute(r ApiCreateProject
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -675,10 +675,10 @@ func (a *AuthenticationApiService) FindAPIKeysExecute(r ApiFindAPIKeysRequest) (
 	localVarFormParams := url.Values{}
 
 	if r.search != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -827,7 +827,7 @@ func (a *AuthenticationApiService) FindProjectAPIKeysExecute(r ApiFindProjectAPI
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_batches.go b/services/metalv1/api_batches.go
index 1fe04cf9..5ae7bc51 100644
--- a/services/metalv1/api_batches.go
+++ b/services/metalv1/api_batches.go
@@ -248,7 +248,7 @@ func (a *BatchesApiService) DeleteBatchExecute(r ApiDeleteBatchRequest) (*http.R
 	localVarFormParams := url.Values{}
 
 	if r.removeAssociatedInstances != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "remove_associated_instances", r.removeAssociatedInstances, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "remove_associated_instances", r.removeAssociatedInstances, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -388,7 +388,7 @@ func (a *BatchesApiService) FindBatchByIdExecute(r ApiFindBatchByIdRequest) (*Ba
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -537,7 +537,7 @@ func (a *BatchesApiService) FindBatchesByProjectExecute(r ApiFindBatchesByProjec
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_bgp.go b/services/metalv1/api_bgp.go
index dfe3940e..0a47840d 100644
--- a/services/metalv1/api_bgp.go
+++ b/services/metalv1/api_bgp.go
@@ -216,7 +216,7 @@ func (a *BGPApiService) FindBgpConfigByProjectExecute(r ApiFindBgpConfigByProjec
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -376,7 +376,7 @@ func (a *BGPApiService) FindBgpSessionByIdExecute(r ApiFindBgpSessionByIdRequest
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -832,7 +832,7 @@ func (a *BGPApiService) RequestBgpConfigExecute(r ApiRequestBgpConfigRequest) (*
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_devices.go b/services/metalv1/api_devices.go
index 5808ba24..773baf14 100644
--- a/services/metalv1/api_devices.go
+++ b/services/metalv1/api_devices.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -88,7 +89,7 @@ func (a *DevicesApiService) CreateBgpSessionExecute(r ApiCreateBgpSessionRequest
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -269,10 +270,10 @@ func (a *DevicesApiService) CreateDeviceExecute(r ApiCreateDeviceRequest) (*Devi
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -462,10 +463,10 @@ func (a *DevicesApiService) CreateIPAssignmentExecute(r ApiCreateIPAssignmentReq
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -624,7 +625,7 @@ func (a *DevicesApiService) DeleteDeviceExecute(r ApiDeleteDeviceRequest) (*http
 	localVarFormParams := url.Values{}
 
 	if r.forceDelete != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "force_delete", r.forceDelete, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "force_delete", r.forceDelete, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -786,7 +787,7 @@ func (a *DevicesApiService) FindBgpSessionsExecute(r ApiFindBgpSessionsRequest)
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -944,10 +945,10 @@ func (a *DevicesApiService) FindDeviceByIdExecute(r ApiFindDeviceByIdRequest) (*
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1694,10 +1695,10 @@ func (a *DevicesApiService) FindIPAssignmentsExecute(r ApiFindIPAssignmentsReque
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1855,8 +1856,8 @@ func (a *DevicesApiService) FindInstanceBandwidthExecute(r ApiFindInstanceBandwi
 		return nil, reportError("until is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "from", r.from, "")
-	parameterAddToHeaderOrQuery(localVarQueryParams, "until", r.until, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "from", r.from, "form", "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "until", r.until, "form", "")
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
 
@@ -2079,43 +2080,51 @@ func (a *DevicesApiService) FindOrganizationDevicesExecute(r ApiFindOrganization
 	localVarFormParams := url.Values{}
 
 	if r.search != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "form", "")
 	}
 	if r.categories != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "categories", r.categories, "csv")
+		t := *r.categories
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "categories", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "categories", t, "form", "multi")
+		}
 	}
 	if r.facility != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "form", "")
 	}
 	if r.hostname != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "hostname", r.hostname, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "hostname", r.hostname, "form", "")
 	}
 	if r.reserved != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "reserved", r.reserved, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "reserved", r.reserved, "form", "")
 	}
 	if r.tag != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "tag", r.tag, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "tag", r.tag, "form", "")
 	}
 	if r.type_ != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "type", r.type_, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "type", r.type_, "form", "")
 	}
 	if r.hasTerminationTime != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "has_termination_time", r.hasTerminationTime, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "has_termination_time", r.hasTerminationTime, "form", "")
 	}
 	if r.macAddress != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "mac_address", r.macAddress, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "mac_address", r.macAddress, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2391,46 +2400,54 @@ func (a *DevicesApiService) FindProjectDevicesExecute(r ApiFindProjectDevicesReq
 	localVarFormParams := url.Values{}
 
 	if r.search != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "form", "")
 	}
 	if r.categories != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "categories", r.categories, "csv")
+		t := *r.categories
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "categories", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "categories", t, "form", "multi")
+		}
 	}
 	if r.facility != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "form", "")
 	}
 	if r.metro != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "form", "")
 	}
 	if r.hostname != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "hostname", r.hostname, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "hostname", r.hostname, "form", "")
 	}
 	if r.reserved != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "reserved", r.reserved, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "reserved", r.reserved, "form", "")
 	}
 	if r.tag != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "tag", r.tag, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "tag", r.tag, "form", "")
 	}
 	if r.type_ != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "type", r.type_, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "type", r.type_, "form", "")
 	}
 	if r.hasTerminationTime != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "has_termination_time", r.hasTerminationTime, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "has_termination_time", r.hasTerminationTime, "form", "")
 	}
 	if r.macAddress != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "mac_address", r.macAddress, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "mac_address", r.macAddress, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2636,15 +2653,15 @@ func (a *DevicesApiService) FindTrafficExecute(r ApiFindTrafficRequest) (*http.R
 		return nil, reportError("direction is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "direction", r.direction, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "direction", r.direction, "form", "")
 	if r.interval != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "interval", r.interval, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "interval", r.interval, "form", "")
 	}
 	if r.bucket != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "bucket", r.bucket, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "bucket", r.bucket, "form", "")
 	}
 	if r.timeframe != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "timeframe", r.timeframe, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "timeframe", r.timeframe, "deepObject", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2795,7 +2812,7 @@ func (a *DevicesApiService) GetBgpNeighborDataExecute(r ApiGetBgpNeighborDataReq
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -3378,10 +3395,10 @@ func (a *DevicesApiService) UpdateDeviceExecute(r ApiUpdateDeviceRequest) (*Devi
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_events.go b/services/metalv1/api_events.go
index 40b53c2b..bf4bf41d 100644
--- a/services/metalv1/api_events.go
+++ b/services/metalv1/api_events.go
@@ -99,16 +99,16 @@ func (a *EventsApiService) FindDeviceEventsExecute(r ApiFindDeviceEventsRequest)
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -300,10 +300,10 @@ func (a *EventsApiService) FindEventByIdExecute(r ApiFindEventByIdRequest) (*Eve
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -480,16 +480,16 @@ func (a *EventsApiService) FindEventsExecute(r ApiFindEventsRequest) (*EventList
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -673,16 +673,16 @@ func (a *EventsApiService) FindInterconnectionEventsExecute(r ApiFindInterconnec
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -892,16 +892,16 @@ func (a *EventsApiService) FindInterconnectionPortEventsExecute(r ApiFindInterco
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1082,16 +1082,16 @@ func (a *EventsApiService) FindOrganizationEventsExecute(r ApiFindOrganizationEv
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1297,16 +1297,16 @@ func (a *EventsApiService) FindProjectEventsExecute(r ApiFindProjectEventsReques
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1512,16 +1512,16 @@ func (a *EventsApiService) FindVirtualCircuitEventsExecute(r ApiFindVirtualCircu
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1702,16 +1702,16 @@ func (a *EventsApiService) FindVrfRouteEventsExecute(r ApiFindVrfRouteEventsRequ
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_facilities.go b/services/metalv1/api_facilities.go
index 855bb8a5..3e03269c 100644
--- a/services/metalv1/api_facilities.go
+++ b/services/metalv1/api_facilities.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -85,10 +86,26 @@ func (a *FacilitiesApiService) FindFacilitiesExecute(r ApiFindFacilitiesRequest)
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		t := *r.include
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "include", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "include", t, "form", "multi")
+		}
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		t := *r.exclude
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", t, "form", "multi")
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -237,10 +254,10 @@ func (a *FacilitiesApiService) FindFacilitiesByOrganizationExecute(r ApiFindFaci
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -411,10 +428,10 @@ func (a *FacilitiesApiService) FindFacilitiesByProjectExecute(r ApiFindFacilitie
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_firmware_sets.go b/services/metalv1/api_firmware_sets.go
index 30000378..55bbecad 100644
--- a/services/metalv1/api_firmware_sets.go
+++ b/services/metalv1/api_firmware_sets.go
@@ -85,10 +85,10 @@ func (a *FirmwareSetsApiService) GetOrganizationFirmwareSetsExecute(r ApiGetOrga
 	localVarFormParams := url.Values{}
 
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -233,10 +233,10 @@ func (a *FirmwareSetsApiService) GetProjectFirmwareSetsExecute(r ApiGetProjectFi
 	localVarFormParams := url.Values{}
 
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_hardware_reservations.go b/services/metalv1/api_hardware_reservations.go
index 34cb7f18..25a3b178 100644
--- a/services/metalv1/api_hardware_reservations.go
+++ b/services/metalv1/api_hardware_reservations.go
@@ -92,10 +92,10 @@ func (a *HardwareReservationsApiService) ActivateHardwareReservationExecute(r Ap
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -264,10 +264,10 @@ func (a *HardwareReservationsApiService) FindHardwareReservationByIdExecute(r Ap
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -469,25 +469,25 @@ func (a *HardwareReservationsApiService) FindProjectHardwareReservationsExecute(
 	localVarFormParams := url.Values{}
 
 	if r.query != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "query", r.query, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "query", r.query, "form", "")
 	}
 	if r.state != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "state", r.state, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "state", r.state, "form", "")
 	}
 	if r.provisionable != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "provisionable", r.provisionable, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "provisionable", r.provisionable, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -689,10 +689,10 @@ func (a *HardwareReservationsApiService) MoveHardwareReservationExecute(r ApiMov
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_incidents.go b/services/metalv1/api_incidents.go
index 5174943b..e4072aa0 100644
--- a/services/metalv1/api_incidents.go
+++ b/services/metalv1/api_incidents.go
@@ -77,10 +77,10 @@ func (a *IncidentsApiService) FindIncidentsExecute(r ApiFindIncidentsRequest) (*
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_interconnections.go b/services/metalv1/api_interconnections.go
index c6eb2b6d..7f80e4bf 100644
--- a/services/metalv1/api_interconnections.go
+++ b/services/metalv1/api_interconnections.go
@@ -250,10 +250,10 @@ func (a *InterconnectionsApiService) CreateOrganizationInterconnectionExecute(r
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -432,10 +432,10 @@ func (a *InterconnectionsApiService) CreateProjectInterconnectionExecute(r ApiCr
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -593,10 +593,10 @@ func (a *InterconnectionsApiService) DeleteInterconnectionExecute(r ApiDeleteInt
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -752,10 +752,10 @@ func (a *InterconnectionsApiService) DeleteVirtualCircuitExecute(r ApiDeleteVirt
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -911,10 +911,10 @@ func (a *InterconnectionsApiService) GetInterconnectionExecute(r ApiGetInterconn
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1209,10 +1209,10 @@ func (a *InterconnectionsApiService) GetInterconnectionPortExecute(r ApiGetInter
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1503,10 +1503,10 @@ func (a *InterconnectionsApiService) GetVirtualCircuitExecute(r ApiGetVirtualCir
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1666,10 +1666,10 @@ func (a *InterconnectionsApiService) ListInterconnectionPortVirtualCircuitsExecu
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2103,10 +2103,10 @@ func (a *InterconnectionsApiService) OrganizationListInterconnectionsExecute(r A
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2276,16 +2276,16 @@ func (a *InterconnectionsApiService) ProjectListInterconnectionsExecute(r ApiPro
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2476,10 +2476,10 @@ func (a *InterconnectionsApiService) UpdateInterconnectionExecute(r ApiUpdateInt
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -2647,10 +2647,10 @@ func (a *InterconnectionsApiService) UpdateVirtualCircuitExecute(r ApiUpdateVirt
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_invitations.go b/services/metalv1/api_invitations.go
index 625d2200..fba5e1ee 100644
--- a/services/metalv1/api_invitations.go
+++ b/services/metalv1/api_invitations.go
@@ -78,7 +78,7 @@ func (a *InvitationsApiService) AcceptInvitationExecute(r ApiAcceptInvitationReq
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -376,7 +376,7 @@ func (a *InvitationsApiService) FindInvitationByIdExecute(r ApiFindInvitationByI
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_invoices.go b/services/metalv1/api_invoices.go
index b1f5c3b5..68948db6 100644
--- a/services/metalv1/api_invoices.go
+++ b/services/metalv1/api_invoices.go
@@ -92,13 +92,13 @@ func (a *InvoicesApiService) FindOrganizationInvoicesExecute(r ApiFindOrganizati
 	localVarFormParams := url.Values{}
 
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	if r.status != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "status", r.status, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "status", r.status, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_ip_addresses.go b/services/metalv1/api_ip_addresses.go
index 0fb6ec5a..77eeba36 100644
--- a/services/metalv1/api_ip_addresses.go
+++ b/services/metalv1/api_ip_addresses.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -231,10 +232,10 @@ func (a *IPAddressesApiService) FindIPAddressByIdExecute(r ApiFindIPAddressByIdR
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -534,7 +535,7 @@ func (a *IPAddressesApiService) FindIPAvailabilitiesExecute(r ApiFindIPAvailabil
 		return localVarReturnValue, nil, reportError("cidr is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "cidr", r.cidr, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "cidr", r.cidr, "form", "")
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
 
@@ -721,19 +722,27 @@ func (a *IPAddressesApiService) FindIPReservationsExecute(r ApiFindIPReservation
 	localVarFormParams := url.Values{}
 
 	if r.types != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "types", r.types, "csv")
+		t := *r.types
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "types", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "types", t, "form", "multi")
+		}
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -935,10 +944,10 @@ func (a *IPAddressesApiService) RequestIPReservationExecute(r ApiRequestIPReserv
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -1124,10 +1133,10 @@ func (a *IPAddressesApiService) UpdateIPAddressExecute(r ApiUpdateIPAddressReque
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_licenses.go b/services/metalv1/api_licenses.go
index a9f53ec9..5ad615c3 100644
--- a/services/metalv1/api_licenses.go
+++ b/services/metalv1/api_licenses.go
@@ -95,10 +95,10 @@ func (a *LicensesApiService) CreateLicenseExecute(r ApiCreateLicenseRequest) (*L
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -416,10 +416,10 @@ func (a *LicensesApiService) FindLicenseByIdExecute(r ApiFindLicenseByIdRequest)
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -600,16 +600,16 @@ func (a *LicensesApiService) FindProjectLicensesExecute(r ApiFindProjectLicenses
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -786,10 +786,10 @@ func (a *LicensesApiService) UpdateLicenseExecute(r ApiUpdateLicenseRequest) (*L
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_memberships.go b/services/metalv1/api_memberships.go
index b53cda16..b765a4fb 100644
--- a/services/metalv1/api_memberships.go
+++ b/services/metalv1/api_memberships.go
@@ -216,7 +216,7 @@ func (a *MembershipsApiService) FindMembershipByIdExecute(r ApiFindMembershipByI
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -386,7 +386,7 @@ func (a *MembershipsApiService) UpdateMembershipExecute(r ApiUpdateMembershipReq
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_metal_gateways.go b/services/metalv1/api_metal_gateways.go
index faa8d1d6..c4ffe2a0 100644
--- a/services/metalv1/api_metal_gateways.go
+++ b/services/metalv1/api_metal_gateways.go
@@ -96,10 +96,10 @@ func (a *MetalGatewaysApiService) CreateBgpDynamicNeighborExecute(r ApiCreateBgp
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -303,16 +303,16 @@ func (a *MetalGatewaysApiService) CreateMetalGatewayExecute(r ApiCreateMetalGate
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -494,10 +494,10 @@ func (a *MetalGatewaysApiService) CreateMetalGatewayElasticIpExecute(r ApiCreate
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -677,10 +677,10 @@ func (a *MetalGatewaysApiService) DeleteMetalGatewayExecute(r ApiDeleteMetalGate
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -836,10 +836,10 @@ func (a *MetalGatewaysApiService) FindMetalGatewayByIdExecute(r ApiFindMetalGate
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1009,16 +1009,16 @@ func (a *MetalGatewaysApiService) FindMetalGatewaysByProjectExecute(r ApiFindMet
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1199,10 +1199,10 @@ func (a *MetalGatewaysApiService) GetBgpDynamicNeighborsExecute(r ApiGetBgpDynam
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1358,10 +1358,10 @@ func (a *MetalGatewaysApiService) GetMetalGatewayElasticIpsExecute(r ApiGetMetal
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_organizations.go b/services/metalv1/api_organizations.go
index 4cf14348..c8a952e0 100644
--- a/services/metalv1/api_organizations.go
+++ b/services/metalv1/api_organizations.go
@@ -91,10 +91,10 @@ func (a *OrganizationsApiService) CreateOrganizationExecute(r ApiCreateOrganizat
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -267,7 +267,7 @@ func (a *OrganizationsApiService) CreateOrganizationInvitationExecute(r ApiCreat
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -457,10 +457,10 @@ func (a *OrganizationsApiService) CreateOrganizationProjectExecute(r ApiCreateOr
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -621,7 +621,7 @@ func (a *OrganizationsApiService) CreatePaymentMethodExecute(r ApiCreatePaymentM
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -910,7 +910,7 @@ func (a *OrganizationsApiService) FindOperatingSystemsByOrganizationExecute(r Ap
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1077,10 +1077,10 @@ func (a *OrganizationsApiService) FindOrganizationByIdExecute(r ApiFindOrganizat
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1392,13 +1392,13 @@ func (a *OrganizationsApiService) FindOrganizationInvitationsExecute(r ApiFindOr
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1572,13 +1572,13 @@ func (a *OrganizationsApiService) FindOrganizationPaymentMethodsExecute(r ApiFin
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1755,19 +1755,19 @@ func (a *OrganizationsApiService) FindOrganizationProjectsExecute(r ApiFindOrgan
 	localVarFormParams := url.Values{}
 
 	if r.name != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "name", r.name, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "name", r.name, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1930,7 +1930,7 @@ func (a *OrganizationsApiService) FindOrganizationTransfersExecute(r ApiFindOrga
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2110,22 +2110,22 @@ func (a *OrganizationsApiService) FindOrganizationsExecute(r ApiFindOrganization
 	localVarFormParams := url.Values{}
 
 	if r.personal != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "personal", r.personal, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "personal", r.personal, "form", "")
 	}
 	if r.withoutProjects != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "without_projects", r.withoutProjects, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "without_projects", r.withoutProjects, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2295,10 +2295,10 @@ func (a *OrganizationsApiService) FindPlansByOrganizationExecute(r ApiFindPlansB
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2475,10 +2475,10 @@ func (a *OrganizationsApiService) UpdateOrganizationExecute(r ApiUpdateOrganizat
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_password_reset_tokens.go b/services/metalv1/api_password_reset_tokens.go
index df383a77..98d712d6 100644
--- a/services/metalv1/api_password_reset_tokens.go
+++ b/services/metalv1/api_password_reset_tokens.go
@@ -72,7 +72,7 @@ func (a *PasswordResetTokensApiService) CreatePasswordResetTokenExecute(r ApiCre
 		return nil, reportError("email is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "email", r.email, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "email", r.email, "form", "")
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
 
diff --git a/services/metalv1/api_payment_methods.go b/services/metalv1/api_payment_methods.go
index 0e3827b6..f4add528 100644
--- a/services/metalv1/api_payment_methods.go
+++ b/services/metalv1/api_payment_methods.go
@@ -205,7 +205,7 @@ func (a *PaymentMethodsApiService) FindPaymentMethodByIdExecute(r ApiFindPayment
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -364,7 +364,7 @@ func (a *PaymentMethodsApiService) UpdatePaymentMethodExecute(r ApiUpdatePayment
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_plans.go b/services/metalv1/api_plans.go
index 7f90e7dc..465c7ada 100644
--- a/services/metalv1/api_plans.go
+++ b/services/metalv1/api_plans.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -102,19 +103,27 @@ func (a *PlansApiService) FindPlansExecute(r ApiFindPlansRequest) (*PlanList, *h
 	localVarFormParams := url.Values{}
 
 	if r.categories != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "categories[]", r.categories, "csv")
+		t := *r.categories
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "categories[]", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "categories[]", t, "form", "multi")
+		}
 	}
 	if r.type_ != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "type", r.type_, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "type", r.type_, "form", "")
 	}
 	if r.slug != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "slug", r.slug, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "slug", r.slug, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -259,10 +268,10 @@ func (a *PlansApiService) FindPlansByProjectExecute(r ApiFindPlansByProjectReque
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_ports.go b/services/metalv1/api_ports.go
index decff445..3bed219d 100644
--- a/services/metalv1/api_ports.go
+++ b/services/metalv1/api_ports.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -87,9 +88,9 @@ func (a *PortsApiService) AssignNativeVlanExecute(r ApiAssignNativeVlanRequest)
 		return localVarReturnValue, nil, reportError("vnid is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "vnid", r.vnid, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "vnid", r.vnid, "form", "")
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -259,7 +260,7 @@ func (a *PortsApiService) AssignPortExecute(r ApiAssignPortRequest) (*Port, *htt
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -439,10 +440,10 @@ func (a *PortsApiService) BondPortExecute(r ApiBondPortRequest) (*Port, *http.Re
 	localVarFormParams := url.Values{}
 
 	if r.bulkEnable != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "bulk_enable", r.bulkEnable, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "bulk_enable", r.bulkEnable, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -623,7 +624,7 @@ func (a *PortsApiService) ConvertLayer2Execute(r ApiConvertLayer2Request) (*Port
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -803,7 +804,7 @@ func (a *PortsApiService) ConvertLayer3Execute(r ApiConvertLayer3Request) (*Port
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -986,7 +987,7 @@ func (a *PortsApiService) CreatePortVlanAssignmentBatchExecute(r ApiCreatePortVl
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -1159,7 +1160,7 @@ func (a *PortsApiService) DeleteNativeVlanExecute(r ApiDeleteNativeVlanRequest)
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1326,10 +1327,10 @@ func (a *PortsApiService) DisbondPortExecute(r ApiDisbondPortRequest) (*Port, *h
 	localVarFormParams := url.Values{}
 
 	if r.bulkDisable != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "bulk_disable", r.bulkDisable, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "bulk_disable", r.bulkDisable, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1500,7 +1501,7 @@ func (a *PortsApiService) FindPortByIdExecute(r ApiFindPortByIdRequest) (*Port,
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1653,7 +1654,7 @@ func (a *PortsApiService) FindPortVlanAssignmentBatchByPortIdAndBatchIdExecute(r
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1967,7 +1968,15 @@ func (a *PortsApiService) FindPortVlanAssignmentByPortIdAndAssignmentIdExecute(r
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		t := *r.include
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "include", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "include", t, "form", "multi")
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2127,7 +2136,15 @@ func (a *PortsApiService) FindPortVlanAssignmentsExecute(r ApiFindPortVlanAssign
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		t := *r.include
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "include", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "include", t, "form", "multi")
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2297,7 +2314,7 @@ func (a *PortsApiService) UnassignPortExecute(r ApiUnassignPortRequest) (*Port,
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_projects.go b/services/metalv1/api_projects.go
index a8bb7aea..a03fc7fb 100644
--- a/services/metalv1/api_projects.go
+++ b/services/metalv1/api_projects.go
@@ -91,10 +91,10 @@ func (a *ProjectsApiService) CreateProjectExecute(r ApiCreateProjectRequest) (*P
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -255,7 +255,7 @@ func (a *ProjectsApiService) CreateProjectInvitationExecute(r ApiCreateProjectIn
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -442,7 +442,7 @@ func (a *ProjectsApiService) CreateTransferRequestExecute(r ApiCreateTransferReq
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -902,10 +902,10 @@ func (a *ProjectsApiService) FindProjectByIdExecute(r ApiFindProjectByIdRequest)
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1217,13 +1217,13 @@ func (a *ProjectsApiService) FindProjectInvitationsExecute(r ApiFindProjectInvit
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1404,16 +1404,16 @@ func (a *ProjectsApiService) FindProjectMembershipsExecute(r ApiFindProjectMembe
 	localVarFormParams := url.Values{}
 
 	if r.search != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1597,19 +1597,19 @@ func (a *ProjectsApiService) FindProjectsExecute(r ApiFindProjectsRequest) (*Pro
 	localVarFormParams := url.Values{}
 
 	if r.name != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "name", r.name, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "name", r.name, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1789,10 +1789,10 @@ func (a *ProjectsApiService) UpdateProjectExecute(r ApiUpdateProjectRequest) (*P
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_self_service_reservations.go b/services/metalv1/api_self_service_reservations.go
index 1ac50954..18efa3c0 100644
--- a/services/metalv1/api_self_service_reservations.go
+++ b/services/metalv1/api_self_service_reservations.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -386,13 +387,21 @@ func (a *SelfServiceReservationsApiService) FindSelfServiceReservationsExecute(r
 	localVarFormParams := url.Values{}
 
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	if r.categories != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "categories", r.categories, "csv")
+		t := *r.categories
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "categories", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "categories", t, "form", "multi")
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_spot_market.go b/services/metalv1/api_spot_market.go
index 939234be..d9dca141 100644
--- a/services/metalv1/api_spot_market.go
+++ b/services/metalv1/api_spot_market.go
@@ -245,7 +245,7 @@ func (a *SpotMarketApiService) DeleteSpotMarketRequestExecute(r ApiDeleteSpotMar
 	localVarFormParams := url.Values{}
 
 	if r.forceTermination != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "force_termination", r.forceTermination, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "force_termination", r.forceTermination, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -399,10 +399,10 @@ func (a *SpotMarketApiService) FindMetroSpotMarketPricesExecute(r ApiFindMetroSp
 	localVarFormParams := url.Values{}
 
 	if r.metro != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "form", "")
 	}
 	if r.plan != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "plan", r.plan, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "plan", r.plan, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -554,10 +554,10 @@ func (a *SpotMarketApiService) FindSpotMarketPricesExecute(r ApiFindSpotMarketPr
 	localVarFormParams := url.Values{}
 
 	if r.facility != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "form", "")
 	}
 	if r.plan != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "plan", r.plan, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "plan", r.plan, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -743,13 +743,13 @@ func (a *SpotMarketApiService) FindSpotMarketPricesHistoryExecute(r ApiFindSpotM
 		return localVarReturnValue, nil, reportError("until is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "")
-	parameterAddToHeaderOrQuery(localVarQueryParams, "plan", r.plan, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "form", "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "plan", r.plan, "form", "")
 	if r.metro != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "form", "")
 	}
-	parameterAddToHeaderOrQuery(localVarQueryParams, "from", r.from, "")
-	parameterAddToHeaderOrQuery(localVarQueryParams, "until", r.until, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "from", r.from, "form", "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "until", r.until, "form", "")
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
 
@@ -897,7 +897,7 @@ func (a *SpotMarketApiService) FindSpotMarketRequestByIdExecute(r ApiFindSpotMar
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_ssh_keys.go b/services/metalv1/api_ssh_keys.go
index 984f1e6e..0220d1e1 100644
--- a/services/metalv1/api_ssh_keys.go
+++ b/services/metalv1/api_ssh_keys.go
@@ -88,7 +88,7 @@ func (a *SSHKeysApiService) CreateProjectSSHKeyExecute(r ApiCreateProjectSSHKeyR
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -245,7 +245,7 @@ func (a *SSHKeysApiService) CreateSSHKeyExecute(r ApiCreateSSHKeyRequest) (*SSHK
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -541,10 +541,10 @@ func (a *SSHKeysApiService) FindDeviceSSHKeysExecute(r ApiFindDeviceSSHKeysReque
 	localVarFormParams := url.Values{}
 
 	if r.searchString != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "Search string", r.searchString, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "Search string", r.searchString, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -689,10 +689,10 @@ func (a *SSHKeysApiService) FindProjectSSHKeysExecute(r ApiFindProjectSSHKeysReq
 	localVarFormParams := url.Values{}
 
 	if r.query != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "query", r.query, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "query", r.query, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -830,7 +830,7 @@ func (a *SSHKeysApiService) FindSSHKeyByIdExecute(r ApiFindSSHKeyByIdRequest) (*
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -993,10 +993,10 @@ func (a *SSHKeysApiService) FindSSHKeysExecute(r ApiFindSSHKeysRequest) (*SSHKey
 	localVarFormParams := url.Values{}
 
 	if r.search != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "search", r.search, "form", "")
 	}
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1144,7 +1144,7 @@ func (a *SSHKeysApiService) UpdateSSHKeyExecute(r ApiUpdateSSHKeyRequest) (*SSHK
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_transfer_requests.go b/services/metalv1/api_transfer_requests.go
index b7ea97a5..89102b4f 100644
--- a/services/metalv1/api_transfer_requests.go
+++ b/services/metalv1/api_transfer_requests.go
@@ -354,7 +354,7 @@ func (a *TransferRequestsApiService) FindTransferRequestByIdExecute(r ApiFindTra
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_two_factor_auth.go b/services/metalv1/api_two_factor_auth.go
index 5d204084..be603521 100644
--- a/services/metalv1/api_two_factor_auth.go
+++ b/services/metalv1/api_two_factor_auth.go
@@ -88,7 +88,7 @@ func (a *TwoFactorAuthApiService) DisableTfaAppExecute(r ApiDisableTfaAppRequest
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	parameterAddToHeaderOrQuery(localVarHeaderParams, "x-otp-token", r.xOtpToken, "")
+	parameterAddToHeaderOrQuery(localVarHeaderParams, "x-otp-token", r.xOtpToken, "simple", "")
 	if r.ctx != nil {
 		// API Key Authentication
 		if auth, ok := r.ctx.Value(ContextAPIKeys).(map[string]APIKey); ok {
@@ -221,7 +221,7 @@ func (a *TwoFactorAuthApiService) EnableTfaAppExecute(r ApiEnableTfaAppRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	parameterAddToHeaderOrQuery(localVarHeaderParams, "x-otp-token", r.xOtpToken, "")
+	parameterAddToHeaderOrQuery(localVarHeaderParams, "x-otp-token", r.xOtpToken, "simple", "")
 	if r.ctx != nil {
 		// API Key Authentication
 		if auth, ok := r.ctx.Value(ContextAPIKeys).(map[string]APIKey); ok {
diff --git a/services/metalv1/api_usages.go b/services/metalv1/api_usages.go
index 9a7989d2..4c7a04ce 100644
--- a/services/metalv1/api_usages.go
+++ b/services/metalv1/api_usages.go
@@ -85,10 +85,10 @@ func (a *UsagesApiService) FindDeviceUsagesExecute(r ApiFindDeviceUsagesRequest)
 	localVarFormParams := url.Values{}
 
 	if r.createdAfter != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "created[after]", r.createdAfter, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "created[after]", r.createdAfter, "form", "")
 	}
 	if r.createdBefore != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "created[before]", r.createdBefore, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "created[before]", r.createdBefore, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -244,10 +244,10 @@ func (a *UsagesApiService) FindProjectUsageExecute(r ApiFindProjectUsageRequest)
 	localVarFormParams := url.Values{}
 
 	if r.createdAfter != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "created[after]", r.createdAfter, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "created[after]", r.createdAfter, "form", "")
 	}
 	if r.createdBefore != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "created[before]", r.createdBefore, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "created[before]", r.createdBefore, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_user_verification_tokens.go b/services/metalv1/api_user_verification_tokens.go
index bdd089d8..2225ea79 100644
--- a/services/metalv1/api_user_verification_tokens.go
+++ b/services/metalv1/api_user_verification_tokens.go
@@ -80,7 +80,7 @@ func (a *UserVerificationTokensApiService) ConsumeVerificationRequestExecute(r A
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -224,9 +224,9 @@ func (a *UserVerificationTokensApiService) CreateValidationRequestExecute(r ApiC
 		return nil, reportError("login is required and must be specified")
 	}
 
-	parameterAddToHeaderOrQuery(localVarQueryParams, "login", r.login, "")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "login", r.login, "form", "")
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_userdata.go b/services/metalv1/api_userdata.go
index c686311b..bca0f100 100644
--- a/services/metalv1/api_userdata.go
+++ b/services/metalv1/api_userdata.go
@@ -70,7 +70,7 @@ func (a *UserdataApiService) ValidateUserdataExecute(r ApiValidateUserdataReques
 	localVarFormParams := url.Values{}
 
 	if r.userdata != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "userdata", r.userdata, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "userdata", r.userdata, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/services/metalv1/api_users.go b/services/metalv1/api_users.go
index a29200f2..d8fecab9 100644
--- a/services/metalv1/api_users.go
+++ b/services/metalv1/api_users.go
@@ -88,10 +88,10 @@ func (a *UsersApiService) CreateUserExecute(r ApiCreateUserRequest) (*http.Respo
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -236,10 +236,10 @@ func (a *UsersApiService) FindCurrentUserExecute(r ApiFindCurrentUserRequest) (*
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -387,13 +387,13 @@ func (a *UsersApiService) FindInvitationsExecute(r ApiFindInvitationsRequest) (*
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -560,10 +560,10 @@ func (a *UsersApiService) FindUserByIdExecute(r ApiFindUserByIdRequest) (*User,
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -878,16 +878,16 @@ func (a *UsersApiService) FindUsersExecute(r ApiFindUsersRequest) (*UserList, *h
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.page != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "page", r.page, "form", "")
 	}
 	if r.perPage != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "per_page", r.perPage, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1063,10 +1063,10 @@ func (a *UsersApiService) UpdateCurrentUserExecute(r ApiUpdateCurrentUserRequest
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_vlans.go b/services/metalv1/api_vlans.go
index d7a92319..3cb375b8 100644
--- a/services/metalv1/api_vlans.go
+++ b/services/metalv1/api_vlans.go
@@ -95,10 +95,10 @@ func (a *VLANsApiService) CreateVirtualNetworkExecute(r ApiCreateVirtualNetworkR
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -275,10 +275,10 @@ func (a *VLANsApiService) DeleteVirtualNetworkExecute(r ApiDeleteVirtualNetworkR
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -462,16 +462,16 @@ func (a *VLANsApiService) FindVirtualNetworksExecute(r ApiFindVirtualNetworksReq
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.facility != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "facility", r.facility, "form", "")
 	}
 	if r.metro != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -638,10 +638,10 @@ func (a *VLANsApiService) GetVirtualNetworkExecute(r ApiGetVirtualNetworkRequest
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -829,10 +829,10 @@ func (a *VLANsApiService) UpdateVirtualNetworkExecute(r ApiUpdateVirtualNetworkR
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/api_vrfs.go b/services/metalv1/api_vrfs.go
index 91da8f98..81aa490e 100644
--- a/services/metalv1/api_vrfs.go
+++ b/services/metalv1/api_vrfs.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 )
 
@@ -85,10 +86,10 @@ func (a *VRFsApiService) BgpDynamicNeighborsIdGetExecute(r ApiBgpDynamicNeighbor
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -254,10 +255,10 @@ func (a *VRFsApiService) CreateVrfExecute(r ApiCreateVrfRequest) (*Vrf, *http.Re
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -435,10 +436,10 @@ func (a *VRFsApiService) CreateVrfRouteExecute(r ApiCreateVrfRouteRequest) (*Vrf
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -618,10 +619,10 @@ func (a *VRFsApiService) DeleteBgpDynamicNeighborByIdExecute(r ApiDeleteBgpDynam
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -926,10 +927,10 @@ func (a *VRFsApiService) DeleteVrfRouteByIdExecute(r ApiDeleteVrfRouteByIdReques
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1096,10 +1097,10 @@ func (a *VRFsApiService) FindVrfByIdExecute(r ApiFindVrfByIdRequest) (*Vrf, *htt
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1270,10 +1271,26 @@ func (a *VRFsApiService) FindVrfIpReservationExecute(r ApiFindVrfIpReservationRe
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		t := *r.include
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "include", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "include", t, "form", "multi")
+		}
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		t := *r.exclude
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", t, "form", "multi")
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1429,10 +1446,26 @@ func (a *VRFsApiService) FindVrfIpReservationsExecute(r ApiFindVrfIpReservations
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		t := *r.include
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "include", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "include", t, "form", "multi")
+		}
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		t := *r.exclude
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", s.Index(i).Interface(), "form", "multi")
+			}
+		} else {
+			parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", t, "form", "multi")
+		}
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1588,10 +1621,10 @@ func (a *VRFsApiService) FindVrfRouteByIdExecute(r ApiFindVrfRouteByIdRequest) (
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1754,13 +1787,13 @@ func (a *VRFsApiService) FindVrfsExecute(r ApiFindVrfsRequest) (*VrfList, *http.
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	if r.metro != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "metro", r.metro, "form", "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2194,10 +2227,10 @@ func (a *VRFsApiService) GetVrfRoutesExecute(r ApiGetVrfRoutesRequest) (*VrfRout
 	localVarFormParams := url.Values{}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2363,10 +2396,10 @@ func (a *VRFsApiService) UpdateVrfExecute(r ApiUpdateVrfRequest) (*Vrf, *http.Re
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -2555,10 +2588,10 @@ func (a *VRFsApiService) UpdateVrfRouteByIdExecute(r ApiUpdateVrfRouteByIdReques
 	}
 
 	if r.include != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "include", r.include, "form", "csv")
 	}
 	if r.exclude != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "csv")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "exclude", r.exclude, "form", "csv")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
diff --git a/services/metalv1/client.go b/services/metalv1/client.go
index e53678b9..d1c9e580 100644
--- a/services/metalv1/client.go
+++ b/services/metalv1/client.go
@@ -253,7 +253,7 @@ func parameterValueToString(obj interface{}, key string) string {
 
 // parameterAddToHeaderOrQuery adds the provided object to the request header or url query
 // supporting deep object syntax
-func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, style string, collectionType string) {
 	var v = reflect.ValueOf(obj)
 	var value = ""
 	if v == reflect.ValueOf(nil) {
@@ -269,11 +269,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				if err != nil {
 					return
 				}
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, style, collectionType)
 				return
 			}
 			if t, ok := obj.(time.Time); ok {
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339Nano), style, collectionType)
 				return
 			}
 			value = v.Type().String() + " value"
@@ -285,7 +285,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 			var lenIndValue = indValue.Len()
 			for i := 0; i < lenIndValue; i++ {
 				var arrayValue = indValue.Index(i)
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, arrayValue.Interface(), collectionType)
+				var keyPrefixForCollectionType = keyPrefix
+				if style == "deepObject" {
+					keyPrefixForCollectionType = keyPrefix + "[" + strconv.Itoa(i) + "]"
+				}
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefixForCollectionType, arrayValue.Interface(), style, collectionType)
 			}
 			return
 
@@ -297,14 +301,14 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 			iter := indValue.MapRange()
 			for iter.Next() {
 				k, v := iter.Key(), iter.Value()
-				parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), style, collectionType)
 			}
 			return
 
 		case reflect.Interface:
 			fallthrough
 		case reflect.Ptr:
-			parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), collectionType)
+			parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), style, collectionType)
 			return
 
 		case reflect.Int, reflect.Int8, reflect.Int16,
@@ -617,18 +621,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 	return err
 }
 
-// Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) error {
-	return fmt.Errorf(format, a...)
-}
-
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
diff --git a/services/metalv1/docs/DeviceCreateInput.md b/services/metalv1/docs/DeviceCreateInput.md
index ee53d8d7..ddada482 100644
--- a/services/metalv1/docs/DeviceCreateInput.md
+++ b/services/metalv1/docs/DeviceCreateInput.md
@@ -11,7 +11,7 @@ Name | Type | Description | Notes
 **Features** | Pointer to **[]string** | The features attribute allows you to optionally specify what features your server should have.  In the API shorthand syntax, all features listed are &#x60;required&#x60;:  &#x60;&#x60;&#x60; { \&quot;features\&quot;: [\&quot;tpm\&quot;] } &#x60;&#x60;&#x60;  Alternatively, if you do not require a certain feature, but would prefer to be assigned a server with that feature if there are any available, you may specify that feature with a &#x60;preferred&#x60; value. The request will not fail if we have no servers with that feature in our inventory. The API offers an alternative syntax for mixing preferred and required features:  &#x60;&#x60;&#x60; { \&quot;features\&quot;: { \&quot;tpm\&quot;: \&quot;required\&quot;, \&quot;raid\&quot;: \&quot;preferred\&quot; } } &#x60;&#x60;&#x60;  The request will only fail if there are no available servers matching the required &#x60;tpm&#x60; criteria. | [optional] 
 **HardwareReservationId** | Pointer to **string** | The Hardware Reservation UUID to provision. Alternatively, &#x60;next-available&#x60; can be specified to select from any of the available hardware reservations. An error will be returned if the requested reservation option is not available.  See [Reserved Hardware](https://deploy.equinix.com/developers/docs/metal/deploy/reserved/) for more details. | [optional] [default to ""]
 **Hostname** | Pointer to **string** | The hostname to use within the operating system. The same hostname may be used on multiple devices within a project. | [optional] 
-**IpAddresses** | Pointer to [**[]IPAddress**](IPAddress.md) | The &#x60;ip_addresses attribute will allow you to specify the addresses you want created with your device.  The default value configures public IPv4, public IPv6, and private IPv4.  Private IPv4 address is required. When specifying &#x60;ip_addresses&#x60;, one of the array items must enable private IPv4.  Some operating systems require public IPv4 address. In those cases you will receive an error message if public IPv4 is not enabled.  For example, to only configure your server with a private IPv4 address, you can send &#x60;{ \&quot;ip_addresses\&quot;: [{ \&quot;address_family\&quot;: 4, \&quot;public\&quot;: false }] }&#x60;.  It is possible to request a subnet size larger than a &#x60;/30&#x60; by assigning addresses using the UUID(s) of ip_reservations in your project.  For example, &#x60;{ \&quot;ip_addresses\&quot;: [..., {\&quot;address_family\&quot;: 4, \&quot;public\&quot;: true, \&quot;ip_reservations\&quot;: [\&quot;uuid1\&quot;, \&quot;uuid2\&quot;]}] }&#x60;  To access a server without public IPs, you can use our Out-of-Band console access (SOS) or proxy through another server in the project with public IPs enabled. | [optional] [default to [{address_family=4, public=true}, {address_family=4, public=false}, {address_family=6, public=true}]]
+**IpAddresses** | Pointer to [**[]IPAddress**](IPAddress.md) | The &#x60;ip_addresses attribute will allow you to specify the addresses you want created with your device.  The default value configures public IPv4, public IPv6, and private IPv4.  Private IPv4 address is required. When specifying &#x60;ip_addresses&#x60;, one of the array items must enable private IPv4.  Some operating systems require public IPv4 address. In those cases you will receive an error message if public IPv4 is not enabled.  For example, to only configure your server with a private IPv4 address, you can send &#x60;{ \&quot;ip_addresses\&quot;: [{ \&quot;address_family\&quot;: 4, \&quot;public\&quot;: false }] }&#x60;.  It is possible to request a subnet size larger than a &#x60;/30&#x60; by assigning addresses using the UUID(s) of ip_reservations in your project.  For example, &#x60;{ \&quot;ip_addresses\&quot;: [..., {\&quot;address_family\&quot;: 4, \&quot;public\&quot;: true, \&quot;ip_reservations\&quot;: [\&quot;uuid1\&quot;, \&quot;uuid2\&quot;]}] }&#x60;  To access a server without public IPs, you can use our Out-of-Band console access (SOS) or proxy through another server in the project with public IPs enabled. | [optional] [default to [{"address_family":4,"public":true},{"address_family":4,"public":false},{"address_family":6,"public":true}]]
 **IpxeScriptUrl** | Pointer to **string** | When set, the device will chainload an iPXE Script at boot fetched from the supplied URL.  See [Custom iPXE](https://deploy.equinix.com/developers/docs/metal/operating-systems/custom-ipxe/) for more details. | [optional] 
 **Locked** | Pointer to **bool** | Whether the device should be locked, preventing accidental deletion. | [optional] [default to false]
 **NetworkFrozen** | Pointer to **bool** | If true, this instance can not be converted to a different network type. | [optional] 
diff --git a/services/metalv1/docs/FacilitiesApi.md b/services/metalv1/docs/FacilitiesApi.md
index 81bc9909..e726755c 100644
--- a/services/metalv1/docs/FacilitiesApi.md
+++ b/services/metalv1/docs/FacilitiesApi.md
@@ -32,7 +32,7 @@ import (
 
 func main() {
     include := []openapiclient.FindFacilitiesIncludeParameterInner{openapiclient.findFacilities_include_parameter_inner("address")} // []FindFacilitiesIncludeParameterInner | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. (optional)
-    exclude := []openapiclient.FindFacilitiesIncludeParameterInner{openapiclient.findFacilities_include_parameter_inner("address")} // []FindFacilitiesIncludeParameterInner | Nested attributes to exclude. Excluded objects will return only the href attribute. Attribute names can be dotted (up to 3 levels) to exclude deeply nested objects. (optional) (default to [address])
+    exclude := []openapiclient.FindFacilitiesIncludeParameterInner{openapiclient.findFacilities_include_parameter_inner("address")} // []FindFacilitiesIncludeParameterInner | Nested attributes to exclude. Excluded objects will return only the href attribute. Attribute names can be dotted (up to 3 levels) to exclude deeply nested objects. (optional) (default to ["address"])
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -58,7 +58,7 @@ Other parameters are passed through a pointer to a apiFindFacilitiesRequest stru
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **include** | [**[]FindFacilitiesIncludeParameterInner**](FindFacilitiesIncludeParameterInner.md) | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. | 
- **exclude** | [**[]FindFacilitiesIncludeParameterInner**](FindFacilitiesIncludeParameterInner.md) | Nested attributes to exclude. Excluded objects will return only the href attribute. Attribute names can be dotted (up to 3 levels) to exclude deeply nested objects. | [default to [address]]
+ **exclude** | [**[]FindFacilitiesIncludeParameterInner**](FindFacilitiesIncludeParameterInner.md) | Nested attributes to exclude. Excluded objects will return only the href attribute. Attribute names can be dotted (up to 3 levels) to exclude deeply nested objects. | [default to [&quot;address&quot;]]
 
 ### Return type
 
diff --git a/services/metalv1/docs/InstancesBatchCreateInputBatchesInner.md b/services/metalv1/docs/InstancesBatchCreateInputBatchesInner.md
index e89ad011..d339acce 100644
--- a/services/metalv1/docs/InstancesBatchCreateInputBatchesInner.md
+++ b/services/metalv1/docs/InstancesBatchCreateInputBatchesInner.md
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 **Features** | Pointer to **[]string** | The features attribute allows you to optionally specify what features your server should have.  In the API shorthand syntax, all features listed are &#x60;required&#x60;:  &#x60;&#x60;&#x60; { \&quot;features\&quot;: [\&quot;tpm\&quot;] } &#x60;&#x60;&#x60;  Alternatively, if you do not require a certain feature, but would prefer to be assigned a server with that feature if there are any available, you may specify that feature with a &#x60;preferred&#x60; value. The request will not fail if we have no servers with that feature in our inventory. The API offers an alternative syntax for mixing preferred and required features:  &#x60;&#x60;&#x60; { \&quot;features\&quot;: { \&quot;tpm\&quot;: \&quot;required\&quot;, \&quot;raid\&quot;: \&quot;preferred\&quot; } } &#x60;&#x60;&#x60;  The request will only fail if there are no available servers matching the required &#x60;tpm&#x60; criteria. | [optional] 
 **HardwareReservationId** | Pointer to **string** | The Hardware Reservation UUID to provision. Alternatively, &#x60;next-available&#x60; can be specified to select from any of the available hardware reservations. An error will be returned if the requested reservation option is not available.  See [Reserved Hardware](https://deploy.equinix.com/developers/docs/metal/deploy/reserved/) for more details. | [optional] [default to ""]
 **Hostname** | Pointer to **string** | The hostname to use within the operating system. The same hostname may be used on multiple devices within a project. | [optional] 
-**IpAddresses** | Pointer to [**[]IPAddress**](IPAddress.md) | The &#x60;ip_addresses attribute will allow you to specify the addresses you want created with your device.  The default value configures public IPv4, public IPv6, and private IPv4.  Private IPv4 address is required. When specifying &#x60;ip_addresses&#x60;, one of the array items must enable private IPv4.  Some operating systems require public IPv4 address. In those cases you will receive an error message if public IPv4 is not enabled.  For example, to only configure your server with a private IPv4 address, you can send &#x60;{ \&quot;ip_addresses\&quot;: [{ \&quot;address_family\&quot;: 4, \&quot;public\&quot;: false }] }&#x60;.  It is possible to request a subnet size larger than a &#x60;/30&#x60; by assigning addresses using the UUID(s) of ip_reservations in your project.  For example, &#x60;{ \&quot;ip_addresses\&quot;: [..., {\&quot;address_family\&quot;: 4, \&quot;public\&quot;: true, \&quot;ip_reservations\&quot;: [\&quot;uuid1\&quot;, \&quot;uuid2\&quot;]}] }&#x60;  To access a server without public IPs, you can use our Out-of-Band console access (SOS) or proxy through another server in the project with public IPs enabled. | [optional] [default to [{address_family=4, public=true}, {address_family=4, public=false}, {address_family=6, public=true}]]
+**IpAddresses** | Pointer to [**[]IPAddress**](IPAddress.md) | The &#x60;ip_addresses attribute will allow you to specify the addresses you want created with your device.  The default value configures public IPv4, public IPv6, and private IPv4.  Private IPv4 address is required. When specifying &#x60;ip_addresses&#x60;, one of the array items must enable private IPv4.  Some operating systems require public IPv4 address. In those cases you will receive an error message if public IPv4 is not enabled.  For example, to only configure your server with a private IPv4 address, you can send &#x60;{ \&quot;ip_addresses\&quot;: [{ \&quot;address_family\&quot;: 4, \&quot;public\&quot;: false }] }&#x60;.  It is possible to request a subnet size larger than a &#x60;/30&#x60; by assigning addresses using the UUID(s) of ip_reservations in your project.  For example, &#x60;{ \&quot;ip_addresses\&quot;: [..., {\&quot;address_family\&quot;: 4, \&quot;public\&quot;: true, \&quot;ip_reservations\&quot;: [\&quot;uuid1\&quot;, \&quot;uuid2\&quot;]}] }&#x60;  To access a server without public IPs, you can use our Out-of-Band console access (SOS) or proxy through another server in the project with public IPs enabled. | [optional] [default to [{"address_family":4,"public":true},{"address_family":4,"public":false},{"address_family":6,"public":true}]]
 **IpxeScriptUrl** | Pointer to **string** | When set, the device will chainload an iPXE Script at boot fetched from the supplied URL.  See [Custom iPXE](https://deploy.equinix.com/developers/docs/metal/operating-systems/custom-ipxe/) for more details. | [optional] 
 **Locked** | Pointer to **bool** | Whether the device should be locked, preventing accidental deletion. | [optional] [default to false]
 **NetworkFrozen** | Pointer to **bool** | If true, this instance can not be converted to a different network type. | [optional] 
diff --git a/services/metalv1/docs/PortsApi.md b/services/metalv1/docs/PortsApi.md
index d1f0f13c..55c95bed 100644
--- a/services/metalv1/docs/PortsApi.md
+++ b/services/metalv1/docs/PortsApi.md
@@ -851,7 +851,7 @@ import (
 func main() {
     id := "38400000-8cf0-11bd-b23e-10b96e4ef00d" // string | Port UUID
     assignmentId := "38400000-8cf0-11bd-b23e-10b96e4ef00d" // string | Assignment ID
-    include := []string{"Inner_example"} // []string | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. (optional) (default to [port, virtual_network])
+    include := []string{"Inner_example"} // []string | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. (optional) (default to ["port","virtual_network"])
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -883,7 +883,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
 
- **include** | **[]string** | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. | [default to [port, virtual_network]]
+ **include** | **[]string** | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. | [default to [&quot;port&quot;,&quot;virtual_network&quot;]]
 
 ### Return type
 
@@ -925,7 +925,7 @@ import (
 
 func main() {
     id := "38400000-8cf0-11bd-b23e-10b96e4ef00d" // string | Port UUID
-    include := []string{"Inner_example"} // []string | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. (optional) (default to [port, virtual_network])
+    include := []string{"Inner_example"} // []string | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. (optional) (default to ["port","virtual_network"])
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -955,7 +955,7 @@ Other parameters are passed through a pointer to a apiFindPortVlanAssignmentsReq
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
- **include** | **[]string** | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. | [default to [port, virtual_network]]
+ **include** | **[]string** | Nested attributes to include. Included objects will return their full attributes. Attribute names can be dotted (up to 3 levels) to included deeply nested objects. | [default to [&quot;port&quot;,&quot;virtual_network&quot;]]
 
 ### Return type
 
diff --git a/services/metalv1/model_aws_fabric_provider.go b/services/metalv1/model_aws_fabric_provider.go
index 7136d9bf..dee2aba1 100644
--- a/services/metalv1/model_aws_fabric_provider.go
+++ b/services/metalv1/model_aws_fabric_provider.go
@@ -20,7 +20,7 @@ var _ MappedNullable = &AWSFabricProvider{}
 type AWSFabricProvider struct {
 	Type AWSFabricProviderType `json:"type"`
 	// AWS Account ID
-	AccountId            string  `json:"account_id"`
+	AccountId            string  `json:"account_id" validate:"regexp=^\\\\d{12}$"`
 	Location             *string `json:"location,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
diff --git a/services/metalv1/model_bgp_config_request_input.go b/services/metalv1/model_bgp_config_request_input.go
index 45666b2f..df0bed10 100644
--- a/services/metalv1/model_bgp_config_request_input.go
+++ b/services/metalv1/model_bgp_config_request_input.go
@@ -22,7 +22,7 @@ type BgpConfigRequestInput struct {
 	Asn            int64                               `json:"asn"`
 	DeploymentType BgpConfigRequestInputDeploymentType `json:"deployment_type"`
 	// The plaintext password to share between BGP neighbors as an MD5 checksum: * must be 10-20 characters long * may not include punctuation * must be a combination of numbers and letters * must contain at least one lowercase, uppercase, and digit character
-	Md5 *string `json:"md5,omitempty"`
+	Md5 *string `json:"md5,omitempty" validate:"regexp=^(?=.*[a-z])(?=.*[A-Z])(?=.*\\\\d)[a-zA-Z\\\\d]{10,20}$"`
 	// A use case explanation (necessary for global BGP request review).
 	UseCase              *string `json:"use_case,omitempty"`
 	AdditionalProperties map[string]interface{}
diff --git a/services/metalv1/model_create_device_request.go b/services/metalv1/model_create_device_request.go
index 338b85dd..26851ba4 100644
--- a/services/metalv1/model_create_device_request.go
+++ b/services/metalv1/model_create_device_request.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // CreateDeviceRequest - struct for CreateDeviceRequest
@@ -44,7 +45,11 @@ func (dst *CreateDeviceRequest) UnmarshalJSON(data []byte) error {
 		if string(jsonDeviceCreateInFacilityInput) == "{}" { // empty struct
 			dst.DeviceCreateInFacilityInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.DeviceCreateInFacilityInput); err != nil {
+				dst.DeviceCreateInFacilityInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.DeviceCreateInFacilityInput = nil
@@ -57,7 +62,11 @@ func (dst *CreateDeviceRequest) UnmarshalJSON(data []byte) error {
 		if string(jsonDeviceCreateInMetroInput) == "{}" { // empty struct
 			dst.DeviceCreateInMetroInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.DeviceCreateInMetroInput); err != nil {
+				dst.DeviceCreateInMetroInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.DeviceCreateInMetroInput = nil
diff --git a/services/metalv1/model_create_metal_gateway_request.go b/services/metalv1/model_create_metal_gateway_request.go
index bde04f97..87bedc7e 100644
--- a/services/metalv1/model_create_metal_gateway_request.go
+++ b/services/metalv1/model_create_metal_gateway_request.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // CreateMetalGatewayRequest - struct for CreateMetalGatewayRequest
@@ -44,7 +45,11 @@ func (dst *CreateMetalGatewayRequest) UnmarshalJSON(data []byte) error {
 		if string(jsonMetalGatewayCreateInput) == "{}" { // empty struct
 			dst.MetalGatewayCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.MetalGatewayCreateInput); err != nil {
+				dst.MetalGatewayCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.MetalGatewayCreateInput = nil
@@ -57,7 +62,11 @@ func (dst *CreateMetalGatewayRequest) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfMetalGatewayCreateInput) == "{}" { // empty struct
 			dst.VrfMetalGatewayCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfMetalGatewayCreateInput); err != nil {
+				dst.VrfMetalGatewayCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfMetalGatewayCreateInput = nil
diff --git a/services/metalv1/model_create_organization_interconnection_request.go b/services/metalv1/model_create_organization_interconnection_request.go
index 9119802a..faf20a2b 100644
--- a/services/metalv1/model_create_organization_interconnection_request.go
+++ b/services/metalv1/model_create_organization_interconnection_request.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // CreateOrganizationInterconnectionRequest - struct for CreateOrganizationInterconnectionRequest
@@ -68,7 +69,11 @@ func (dst *CreateOrganizationInterconnectionRequest) UnmarshalJSON(data []byte)
 		if string(jsonDedicatedPortCreateInput) == "{}" { // empty struct
 			dst.DedicatedPortCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.DedicatedPortCreateInput); err != nil {
+				dst.DedicatedPortCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.DedicatedPortCreateInput = nil
@@ -81,7 +86,11 @@ func (dst *CreateOrganizationInterconnectionRequest) UnmarshalJSON(data []byte)
 		if string(jsonSharedPortVCVlanCreateInput) == "{}" { // empty struct
 			dst.SharedPortVCVlanCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.SharedPortVCVlanCreateInput); err != nil {
+				dst.SharedPortVCVlanCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.SharedPortVCVlanCreateInput = nil
@@ -94,7 +103,11 @@ func (dst *CreateOrganizationInterconnectionRequest) UnmarshalJSON(data []byte)
 		if string(jsonVlanCSPConnectionCreateInput) == "{}" { // empty struct
 			dst.VlanCSPConnectionCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VlanCSPConnectionCreateInput); err != nil {
+				dst.VlanCSPConnectionCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VlanCSPConnectionCreateInput = nil
@@ -107,7 +120,11 @@ func (dst *CreateOrganizationInterconnectionRequest) UnmarshalJSON(data []byte)
 		if string(jsonVlanFabricVcCreateInput) == "{}" { // empty struct
 			dst.VlanFabricVcCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VlanFabricVcCreateInput); err != nil {
+				dst.VlanFabricVcCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VlanFabricVcCreateInput = nil
@@ -120,7 +137,11 @@ func (dst *CreateOrganizationInterconnectionRequest) UnmarshalJSON(data []byte)
 		if string(jsonVrfFabricVcCreateInput) == "{}" { // empty struct
 			dst.VrfFabricVcCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfFabricVcCreateInput); err != nil {
+				dst.VrfFabricVcCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfFabricVcCreateInput = nil
diff --git a/services/metalv1/model_find_ip_address_by_id_200_response.go b/services/metalv1/model_find_ip_address_by_id_200_response.go
index a2fcd394..a8fe9c45 100644
--- a/services/metalv1/model_find_ip_address_by_id_200_response.go
+++ b/services/metalv1/model_find_ip_address_by_id_200_response.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // FindIPAddressById200Response - struct for FindIPAddressById200Response
@@ -52,7 +53,11 @@ func (dst *FindIPAddressById200Response) UnmarshalJSON(data []byte) error {
 		if string(jsonIPAssignment) == "{}" { // empty struct
 			dst.IPAssignment = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.IPAssignment); err != nil {
+				dst.IPAssignment = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.IPAssignment = nil
@@ -65,7 +70,11 @@ func (dst *FindIPAddressById200Response) UnmarshalJSON(data []byte) error {
 		if string(jsonIPReservation) == "{}" { // empty struct
 			dst.IPReservation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.IPReservation); err != nil {
+				dst.IPReservation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.IPReservation = nil
@@ -78,7 +87,11 @@ func (dst *FindIPAddressById200Response) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfIpReservation) == "{}" { // empty struct
 			dst.VrfIpReservation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfIpReservation); err != nil {
+				dst.VrfIpReservation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfIpReservation = nil
diff --git a/services/metalv1/model_find_metal_gateway_by_id_200_response.go b/services/metalv1/model_find_metal_gateway_by_id_200_response.go
index 9f7a367d..e402416a 100644
--- a/services/metalv1/model_find_metal_gateway_by_id_200_response.go
+++ b/services/metalv1/model_find_metal_gateway_by_id_200_response.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // FindMetalGatewayById200Response - struct for FindMetalGatewayById200Response
@@ -44,7 +45,11 @@ func (dst *FindMetalGatewayById200Response) UnmarshalJSON(data []byte) error {
 		if string(jsonMetalGateway) == "{}" { // empty struct
 			dst.MetalGateway = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.MetalGateway); err != nil {
+				dst.MetalGateway = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.MetalGateway = nil
@@ -57,7 +62,11 @@ func (dst *FindMetalGatewayById200Response) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfMetalGateway) == "{}" { // empty struct
 			dst.VrfMetalGateway = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfMetalGateway); err != nil {
+				dst.VrfMetalGateway = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfMetalGateway = nil
diff --git a/services/metalv1/model_interconnection_fabric_provider.go b/services/metalv1/model_interconnection_fabric_provider.go
index cc09dc91..2f56897a 100644
--- a/services/metalv1/model_interconnection_fabric_provider.go
+++ b/services/metalv1/model_interconnection_fabric_provider.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // InterconnectionFabricProvider - Configuration information for connecting to external cloud service provider. Only available if the fabric_provider param was used when creating the interconnection.
@@ -36,7 +37,11 @@ func (dst *InterconnectionFabricProvider) UnmarshalJSON(data []byte) error {
 		if string(jsonAWSFabricProvider) == "{}" { // empty struct
 			dst.AWSFabricProvider = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.AWSFabricProvider); err != nil {
+				dst.AWSFabricProvider = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.AWSFabricProvider = nil
diff --git a/services/metalv1/model_request_ip_reservation_201_response.go b/services/metalv1/model_request_ip_reservation_201_response.go
index 0c50f3bc..0b53cd4f 100644
--- a/services/metalv1/model_request_ip_reservation_201_response.go
+++ b/services/metalv1/model_request_ip_reservation_201_response.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // RequestIPReservation201Response - struct for RequestIPReservation201Response
@@ -44,7 +45,11 @@ func (dst *RequestIPReservation201Response) UnmarshalJSON(data []byte) error {
 		if string(jsonIPReservation) == "{}" { // empty struct
 			dst.IPReservation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.IPReservation); err != nil {
+				dst.IPReservation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.IPReservation = nil
@@ -57,7 +62,11 @@ func (dst *RequestIPReservation201Response) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfIpReservation) == "{}" { // empty struct
 			dst.VrfIpReservation = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfIpReservation); err != nil {
+				dst.VrfIpReservation = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfIpReservation = nil
diff --git a/services/metalv1/model_request_ip_reservation_request.go b/services/metalv1/model_request_ip_reservation_request.go
index eb8957cb..bd877c4f 100644
--- a/services/metalv1/model_request_ip_reservation_request.go
+++ b/services/metalv1/model_request_ip_reservation_request.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // RequestIPReservationRequest - struct for RequestIPReservationRequest
@@ -44,7 +45,11 @@ func (dst *RequestIPReservationRequest) UnmarshalJSON(data []byte) error {
 		if string(jsonIPReservationRequestInput) == "{}" { // empty struct
 			dst.IPReservationRequestInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.IPReservationRequestInput); err != nil {
+				dst.IPReservationRequestInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.IPReservationRequestInput = nil
@@ -57,7 +62,11 @@ func (dst *RequestIPReservationRequest) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfIpReservationCreateInput) == "{}" { // empty struct
 			dst.VrfIpReservationCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfIpReservationCreateInput); err != nil {
+				dst.VrfIpReservationCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfIpReservationCreateInput = nil
diff --git a/services/metalv1/model_virtual_circuit.go b/services/metalv1/model_virtual_circuit.go
index 8cece30a..3f643183 100644
--- a/services/metalv1/model_virtual_circuit.go
+++ b/services/metalv1/model_virtual_circuit.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // VirtualCircuit - struct for VirtualCircuit
@@ -44,7 +45,11 @@ func (dst *VirtualCircuit) UnmarshalJSON(data []byte) error {
 		if string(jsonVlanVirtualCircuit) == "{}" { // empty struct
 			dst.VlanVirtualCircuit = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VlanVirtualCircuit); err != nil {
+				dst.VlanVirtualCircuit = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VlanVirtualCircuit = nil
@@ -57,7 +62,11 @@ func (dst *VirtualCircuit) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfVirtualCircuit) == "{}" { // empty struct
 			dst.VrfVirtualCircuit = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfVirtualCircuit); err != nil {
+				dst.VrfVirtualCircuit = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfVirtualCircuit = nil
diff --git a/services/metalv1/model_virtual_circuit_create_input.go b/services/metalv1/model_virtual_circuit_create_input.go
index 78bebe08..7c27e628 100644
--- a/services/metalv1/model_virtual_circuit_create_input.go
+++ b/services/metalv1/model_virtual_circuit_create_input.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // VirtualCircuitCreateInput - struct for VirtualCircuitCreateInput
@@ -44,7 +45,11 @@ func (dst *VirtualCircuitCreateInput) UnmarshalJSON(data []byte) error {
 		if string(jsonVlanVirtualCircuitCreateInput) == "{}" { // empty struct
 			dst.VlanVirtualCircuitCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VlanVirtualCircuitCreateInput); err != nil {
+				dst.VlanVirtualCircuitCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VlanVirtualCircuitCreateInput = nil
@@ -57,7 +62,11 @@ func (dst *VirtualCircuitCreateInput) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfVirtualCircuitCreateInput) == "{}" { // empty struct
 			dst.VrfVirtualCircuitCreateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfVirtualCircuitCreateInput); err != nil {
+				dst.VrfVirtualCircuitCreateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfVirtualCircuitCreateInput = nil
diff --git a/services/metalv1/model_virtual_circuit_update_input.go b/services/metalv1/model_virtual_circuit_update_input.go
index 50b44394..90009b87 100644
--- a/services/metalv1/model_virtual_circuit_update_input.go
+++ b/services/metalv1/model_virtual_circuit_update_input.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // VirtualCircuitUpdateInput - struct for VirtualCircuitUpdateInput
@@ -44,7 +45,11 @@ func (dst *VirtualCircuitUpdateInput) UnmarshalJSON(data []byte) error {
 		if string(jsonVlanVirtualCircuitUpdateInput) == "{}" { // empty struct
 			dst.VlanVirtualCircuitUpdateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VlanVirtualCircuitUpdateInput); err != nil {
+				dst.VlanVirtualCircuitUpdateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VlanVirtualCircuitUpdateInput = nil
@@ -57,7 +62,11 @@ func (dst *VirtualCircuitUpdateInput) UnmarshalJSON(data []byte) error {
 		if string(jsonVrfVirtualCircuitUpdateInput) == "{}" { // empty struct
 			dst.VrfVirtualCircuitUpdateInput = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.VrfVirtualCircuitUpdateInput); err != nil {
+				dst.VrfVirtualCircuitUpdateInput = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.VrfVirtualCircuitUpdateInput = nil
diff --git a/services/metalv1/model_vlan_csp_connection_create_input_fabric_provider.go b/services/metalv1/model_vlan_csp_connection_create_input_fabric_provider.go
index d8813085..2640f751 100644
--- a/services/metalv1/model_vlan_csp_connection_create_input_fabric_provider.go
+++ b/services/metalv1/model_vlan_csp_connection_create_input_fabric_provider.go
@@ -11,6 +11,7 @@ package metalv1
 import (
 	"encoding/json"
 	"fmt"
+	"gopkg.in/validator.v2"
 )
 
 // VlanCSPConnectionCreateInputFabricProvider - Configuration information for connecting to external cloud service provider.
@@ -36,7 +37,11 @@ func (dst *VlanCSPConnectionCreateInputFabricProvider) UnmarshalJSON(data []byte
 		if string(jsonAWSFabricProvider) == "{}" { // empty struct
 			dst.AWSFabricProvider = nil
 		} else {
-			match++
+			if err = validator.Validate(dst.AWSFabricProvider); err != nil {
+				dst.AWSFabricProvider = nil
+			} else {
+				match++
+			}
 		}
 	} else {
 		dst.AWSFabricProvider = nil
diff --git a/services/metalv1/model_vrf_virtual_circuit_create_input.go b/services/metalv1/model_vrf_virtual_circuit_create_input.go
index d6ae132e..f559f169 100644
--- a/services/metalv1/model_vrf_virtual_circuit_create_input.go
+++ b/services/metalv1/model_vrf_virtual_circuit_create_input.go
@@ -22,7 +22,7 @@ type VrfVirtualCircuitCreateInput struct {
 	CustomerIp  *string `json:"customer_ip,omitempty"`
 	Description *string `json:"description,omitempty"`
 	// The plaintext BGP peering password shared by neighbors as an MD5 checksum: * must be 10-20 characters long * may not include punctuation * must be a combination of numbers and letters * must contain at least one lowercase, uppercase, and digit character
-	Md5 NullableString `json:"md5,omitempty"`
+	Md5 NullableString `json:"md5,omitempty" validate:"regexp=^(?=.*[a-z])(?=.*[A-Z])(?=.*\\\\d)[a-zA-Z\\\\d]{10,20}$"`
 	// An IPv4 address from the subnet that will be used on the Metal side. This parameter is optional, but if supplied, we will use the other usable IP address in the subnet as the Customer IP. By default, the first usable IP address in the subnet will be used.
 	MetalIp *string `json:"metal_ip,omitempty"`
 	Name    *string `json:"name,omitempty"`
diff --git a/services/metalv1/model_vrf_virtual_circuit_update_input.go b/services/metalv1/model_vrf_virtual_circuit_update_input.go
index 9f248ec8..9562a394 100644
--- a/services/metalv1/model_vrf_virtual_circuit_update_input.go
+++ b/services/metalv1/model_vrf_virtual_circuit_update_input.go
@@ -21,7 +21,7 @@ type VrfVirtualCircuitUpdateInput struct {
 	CustomerIp  *string `json:"customer_ip,omitempty"`
 	Description *string `json:"description,omitempty"`
 	// The plaintext BGP peering password shared by neighbors as an MD5 checksum: * must be 10-20 characters long * may not include punctuation * must be a combination of numbers and letters * must contain at least one lowercase, uppercase, and digit character
-	Md5 *string `json:"md5,omitempty"`
+	Md5 *string `json:"md5,omitempty" validate:"regexp=^(?=.*[a-z])(?=.*[A-Z])(?=.*\\\\d)[a-zA-Z\\\\d]{10,20}$"`
 	// An IPv4 address from the subnet that will be used on the Metal side. This parameter is optional, but if supplied, we will use the other usable IP address in the subnet as the Customer IP. By default, the first usable IP address in the subnet will be used.
 	MetalIp *string `json:"metal_ip,omitempty"`
 	Name    *string `json:"name,omitempty"`
diff --git a/services/metalv1/utils.go b/services/metalv1/utils.go
index dfa89b6c..1384d364 100644
--- a/services/metalv1/utils.go
+++ b/services/metalv1/utils.go
@@ -9,7 +9,9 @@ Contact: support@equinixmetal.com
 package metalv1
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 	"reflect"
 	"time"
 )
@@ -343,3 +345,15 @@ func IsNil(i interface{}) bool {
 type MappedNullable interface {
 	ToMap() (map[string]interface{}, error)
 }
+
+// A wrapper for strict JSON decoding
+func newStrictDecoder(data []byte) *json.Decoder {
+	dec := json.NewDecoder(bytes.NewBuffer(data))
+	dec.DisallowUnknownFields()
+	return dec
+}
+
+// Prevent trying to import "fmt"
+func reportError(format string, a ...interface{}) error {
+	return fmt.Errorf(format, a...)
+}
diff --git a/templates/services/eiav2/client.mustache b/templates/services/eiav2/client.mustache
index 98c76d1f..fcbb85ac 100644
--- a/templates/services/eiav2/client.mustache
+++ b/templates/services/eiav2/client.mustache
@@ -152,7 +152,7 @@ func parameterValueToString( obj interface{}, key string ) string {
 
 // parameterAddToHeaderOrQuery adds the provided object to the request header or url query
 // supporting deep object syntax
-func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, style string, collectionType string) {
 	var v = reflect.ValueOf(obj)
 	var value = ""
 	if v == reflect.ValueOf(nil) {
@@ -168,11 +168,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 					if err != nil {
 						return
 					}
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, style, collectionType)
 					return
 				}
 				if t, ok := obj.(time.Time); ok {
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339), collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339Nano), style, collectionType)
 					return
 				}
 				value = v.Type().String() + " value"
@@ -184,7 +184,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				var lenIndValue = indValue.Len()
 				for i:=0;i<lenIndValue;i++ {
 					var arrayValue = indValue.Index(i)
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, arrayValue.Interface(), collectionType)
+					var keyPrefixForCollectionType = keyPrefix
+					if style == "deepObject" {
+						keyPrefixForCollectionType = keyPrefix + "[" + strconv.Itoa(i) + "]"
+					}
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefixForCollectionType, arrayValue.Interface(), style, collectionType)
 				}
 				return
 
@@ -196,14 +200,14 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				iter := indValue.MapRange()
 				for iter.Next() {
 					k,v := iter.Key(), iter.Value()
-					parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), style, collectionType)
 				}
 				return
 
 			case reflect.Interface:
 				fallthrough
 			case reflect.Ptr:
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), style, collectionType)
 				return
 
 			case reflect.Int, reflect.Int8, reflect.Int16,
@@ -585,18 +589,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 	return err
 }
 
-// Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) error {
-	return fmt.Errorf(format, a...)
-}
-
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
diff --git a/templates/services/eiav2/model_oneof.mustache b/templates/services/eiav2/model_oneof.mustache
new file mode 100644
index 00000000..797793d2
--- /dev/null
+++ b/templates/services/eiav2/model_oneof.mustache
@@ -0,0 +1,154 @@
+// {{classname}} - {{{description}}}{{^description}}struct for {{{classname}}}{{/description}}
+type {{classname}} struct {
+	{{#oneOf}}
+	{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} *{{{.}}}
+	{{/oneOf}}
+}
+
+{{#oneOf}}
+// {{{.}}}As{{classname}} is a convenience function that returns {{{.}}} wrapped in {{classname}}
+func {{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}As{{classname}}(v *{{{.}}}) {{classname}} {
+	return {{classname}}{
+		{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}: v,
+	}
+}
+
+{{/oneOf}}
+
+// Unmarshal JSON data into one of the pointers in the struct
+func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
+	var err error
+	{{#isNullable}}
+	// this object is nullable so check if the payload is null or empty string
+	if string(data) == "" || string(data) == "{}" {
+		return nil
+	}
+
+	{{/isNullable}}
+	{{#useOneOfDiscriminatorLookup}}
+	{{#discriminator}}
+	{{#mappedModels}}
+	{{#-first}}
+	// use discriminator value to speed up the lookup
+	var jsonDict map[string]interface{}
+	err = newStrictDecoder(data).Decode(&jsonDict)
+	if err != nil {
+		return fmt.Errorf("failed to unmarshal JSON into map for the discriminator lookup")
+	}
+
+    // TEMP: hack to avoid unused imports until this PR is merged/released:
+    // https://github.com/OpenAPITools/openapi-generator/pull/20497
+    if err = validator.Validate(jsonDict); err != nil {
+        // Do nothing
+    }
+
+	{{/-first}}
+	// check if the discriminator value is '{{{mappingName}}}'
+	if jsonDict["{{{propertyBaseName}}}"] == "{{{mappingName}}}" {
+		// try to unmarshal JSON data into {{{modelName}}}
+		err = json.Unmarshal(data, &dst.{{{modelName}}})
+		if err == nil {
+			return nil // data stored in dst.{{{modelName}}}, return on the first match
+		} else {
+			dst.{{{modelName}}} = nil
+			return fmt.Errorf("failed to unmarshal {{classname}} as {{{modelName}}}: %s", err.Error())
+		}
+	}
+
+	{{/mappedModels}}
+	return nil
+	{{/discriminator}}
+	{{^discriminator}}
+	match := 0
+	{{#oneOf}}
+	// try to unmarshal data into {{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}
+	err = json.Unmarshal(data, &dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
+	if err == nil {
+		json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}, _ := json.Marshal(dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
+		if string(json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}) == "{}" { // empty struct
+			dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+		} else {
+			match++
+		}
+	} else {
+		dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+	}
+
+	{{/oneOf}}
+	if match > 1 { // more than 1 match
+		// reset to nil
+		{{#oneOf}}
+		dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+		{{/oneOf}}
+
+		return fmt.Errorf("data matches more than one schema in oneOf({{classname}})")
+	} else if match == 1 {
+		return nil // exactly one match
+	} else { // no match
+		return fmt.Errorf("data failed to match schemas in oneOf({{classname}})")
+	}
+	{{/discriminator}}
+	{{/useOneOfDiscriminatorLookup}}
+	{{^useOneOfDiscriminatorLookup}}
+	match := 0
+	{{#oneOf}}
+	// try to unmarshal data into {{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}
+	err = newStrictDecoder(data).Decode(&dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
+	if err == nil {
+		json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}, _ := json.Marshal(dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
+		if string(json{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}) == "{}" { // empty struct
+			dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+		} else {
+			if err = validator.Validate(dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}); err != nil {
+				dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+			} else {
+				match++
+			}
+		}
+	} else {
+		dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+	}
+
+	{{/oneOf}}
+	if match > 1 { // more than 1 match
+		// reset to nil
+		{{#oneOf}}
+		dst.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} = nil
+		{{/oneOf}}
+
+		return fmt.Errorf("data matches more than one schema in oneOf({{classname}})")
+	} else if match == 1 {
+		return nil // exactly one match
+	} else { // no match
+		return fmt.Errorf("data failed to match schemas in oneOf({{classname}})")
+	}
+	{{/useOneOfDiscriminatorLookup}}
+}
+
+// Marshal data from the first non-nil pointers in the struct to JSON
+func (src {{classname}}) MarshalJSON() ([]byte, error) {
+{{#oneOf}}
+	if src.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} != nil {
+		return json.Marshal(&src.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}})
+	}
+
+{{/oneOf}}
+	return nil, nil // no data in oneOf schemas
+}
+
+// Get the actual instance
+func (obj *{{classname}}) GetActualInstance() (interface{}) {
+	if obj == nil {
+		return nil
+	}
+{{#oneOf}}
+	if obj.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}} != nil {
+		return obj.{{#lambda.type-to-name}}{{{.}}}{{/lambda.type-to-name}}
+	}
+
+{{/oneOf}}
+	// all schemas are nil
+	return nil
+}
+
+{{>nullable_model}}
\ No newline at end of file
diff --git a/templates/services/fabricv4/client.mustache b/templates/services/fabricv4/client.mustache
index 6f1aa4d0..d1c4149b 100644
--- a/templates/services/fabricv4/client.mustache
+++ b/templates/services/fabricv4/client.mustache
@@ -152,7 +152,7 @@ func parameterValueToString( obj interface{}, key string ) string {
 
 // parameterAddToHeaderOrQuery adds the provided object to the request header or url query
 // supporting deep object syntax
-func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, style string, collectionType string) {
 	var v = reflect.ValueOf(obj)
 	var value = ""
 	if v == reflect.ValueOf(nil) {
@@ -168,11 +168,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 					if err != nil {
 						return
 					}
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, style, collectionType)
 					return
 				}
 				if t, ok := obj.(time.Time); ok {
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339), collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339Nano), style, collectionType)
 					return
 				}
 				value = v.Type().String() + " value"
@@ -184,7 +184,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				var lenIndValue = indValue.Len()
 				for i:=0;i<lenIndValue;i++ {
 					var arrayValue = indValue.Index(i)
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, arrayValue.Interface(), collectionType)
+					var keyPrefixForCollectionType = keyPrefix
+					if style == "deepObject" {
+						keyPrefixForCollectionType = keyPrefix + "[" + strconv.Itoa(i) + "]"
+					}
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefixForCollectionType, arrayValue.Interface(), style, collectionType)
 				}
 				return
 
@@ -196,14 +200,14 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				iter := indValue.MapRange()
 				for iter.Next() {
 					k,v := iter.Key(), iter.Value()
-					parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), style, collectionType)
 				}
 				return
 
 			case reflect.Interface:
 				fallthrough
 			case reflect.Ptr:
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), style, collectionType)
 				return
 
 			case reflect.Int, reflect.Int8, reflect.Int16,
@@ -585,18 +589,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 	return err
 }
 
-// Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) error {
-	return fmt.Errorf(format, a...)
-}
-
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
diff --git a/templates/services/metalv1/api.mustache b/templates/services/metalv1/api.mustache
index 3bcc75d2..50fed902 100644
--- a/templates/services/metalv1/api.mustache
+++ b/templates/services/metalv1/api.mustache
@@ -189,15 +189,15 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 		if reflect.TypeOf(t).Kind() == reflect.Slice {
 			s := reflect.ValueOf(t)
 			for i := 0; i < s.Len(); i++ {
-				parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{collectionFormat}}")
+				parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{style}}", "{{collectionFormat}}")
 			}
 		} else {
-			parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{collectionFormat}}")
+			parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{style}}", "{{collectionFormat}}")
 		}
 	}
 	{{/isCollectionFormatMulti}}
 	{{^isCollectionFormatMulti}}
-	parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
+	parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
 	{{/isCollectionFormatMulti}}
 	{{/required}}
 	{{^required}}
@@ -207,14 +207,14 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 		if reflect.TypeOf(t).Kind() == reflect.Slice {
 			s := reflect.ValueOf(t)
 			for i := 0; i < s.Len(); i++ {
-				parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{collectionFormat}}")
+				parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{style}}", "{{collectionFormat}}")
 			}
 		} else {
-			parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{collectionFormat}}")
+			parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{style}}", "{{collectionFormat}}")
 		}
 	{{/isCollectionFormatMulti}}
 	{{^isCollectionFormatMulti}}
-		parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
+		parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
 	{{/isCollectionFormatMulti}}
 	}
 	{{/required}}
@@ -242,11 +242,11 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 	}
 {{#headerParams}}
 	{{#required}}
-	parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
+	parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
 	{{/required}}
 	{{^required}}
 	if r.{{paramName}} != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
+		parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
 	}
 	{{/required}}
 {{/headerParams}}
@@ -292,7 +292,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 {{/isFile}}
 {{^isFile}}
 {{#required}}
-	parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
+	parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
 {{/required}}
 {{^required}}
 {{#isModel}}
@@ -306,7 +306,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 {{/isModel}}
 {{^isModel}}
 	if r.{{paramName}} != nil {
-		parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
+		parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
 	}
 {{/isModel}}
 {{/required}}
diff --git a/templates/services/metalv1/client.mustache b/templates/services/metalv1/client.mustache
index 66b5a0b7..bc13bb6d 100644
--- a/templates/services/metalv1/client.mustache
+++ b/templates/services/metalv1/client.mustache
@@ -152,7 +152,7 @@ func parameterValueToString( obj interface{}, key string ) string {
 
 // parameterAddToHeaderOrQuery adds the provided object to the request header or url query
 // supporting deep object syntax
-func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, style string, collectionType string) {
 	var v = reflect.ValueOf(obj)
 	var value = ""
 	if v == reflect.ValueOf(nil) {
@@ -168,11 +168,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 					if err != nil {
 						return
 					}
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, dataMap, style, collectionType)
 					return
 				}
 				if t, ok := obj.(time.Time); ok {
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339), collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, t.Format(time.RFC3339Nano), style, collectionType)
 					return
 				}
 				value = v.Type().String() + " value"
@@ -184,7 +184,11 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				var lenIndValue = indValue.Len()
 				for i:=0;i<lenIndValue;i++ {
 					var arrayValue = indValue.Index(i)
-					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, arrayValue.Interface(), collectionType)
+					var keyPrefixForCollectionType = keyPrefix
+					if style == "deepObject" {
+						keyPrefixForCollectionType = keyPrefix + "[" + strconv.Itoa(i) + "]"
+					}
+					parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefixForCollectionType, arrayValue.Interface(), style, collectionType)
 				}
 				return
 
@@ -196,14 +200,14 @@ func parameterAddToHeaderOrQuery(headerOrQueryParams interface{}, keyPrefix stri
 				iter := indValue.MapRange()
 				for iter.Next() {
 					k,v := iter.Key(), iter.Value()
-					parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), collectionType)
+					parameterAddToHeaderOrQuery(headerOrQueryParams, fmt.Sprintf("%s[%s]", keyPrefix, k.String()), v.Interface(), style, collectionType)
 				}
 				return
 
 			case reflect.Interface:
 				fallthrough
 			case reflect.Ptr:
-				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), collectionType)
+				parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, v.Elem().Interface(), style, collectionType)
 				return
 
 			case reflect.Int, reflect.Int8, reflect.Int16,
@@ -598,18 +602,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 	return err
 }
 
-// Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) error {
-	return fmt.Errorf(format, a...)
-}
-
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {