diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 454dd36c..ea2af8a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.14
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.goreleaser.yml b/.goreleaser.yml
new file mode 100644
index 00000000..3d2c5b3d
--- /dev/null
+++ b/.goreleaser.yml
@@ -0,0 +1,48 @@
+---
+before:
+  hooks:
+    - go mod download
+    - make clean
+    - mkdir build/
+builds:
+  -
+    id: my-build
+    main: ./cmd/dataplaneapi/main.go
+    binary: ./build/dataplaneapi
+    gcflags:
+      - -l
+      - -N
+    ldflags:
+      - -s -w -X main.GitRepo={{.GitURL}} -X main.GitTag={{.Tag}} -X main.GitCommit={{.ShortCommit}} -X main.GitDirty= -X main.BuildTime={{.Date}}
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+      - freebsd
+    goarch:
+      - 386
+      - amd64
+      - arm
+      - arm64
+archives:
+  -
+    id: my-archive
+    builds:
+      - my-build
+    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    replacements:
+      linux: Linux
+      darwin: Darwin
+      freebsd: FreeBSD
+      386: i386
+      amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+release:
+  draft: true
+  name_template: "HAProxy {{toupper .ProjectName}} v{{.Version}}"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aa4440d9..3e761cb9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Data Plane API is generated using [go-swagger](https://github.com/go-swagger/go-
 ./swagger generate server -f haproxy_spec.yaml \
     -A "Data Plane" \
     -t $GOPATH/src/github.com/haproxytech/ \
-    --existing-models github.com/haproxytech/models \
+    --existing-models github.com/haproxytech/models/v2 \
     --exclude-main \
     --skip-models \
     -s dataplaneapi \
diff --git a/README.md b/README.md
index e2cc073b..e1efc1e0 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 ## Building the Data Plane API
 
-In order to build the Data Plane API you need go 1.12 installed on your system with go modules support enabled, and execute the following steps:
+In order to build the Data Plane API you need go 1.14 installed on your system with go modules support enabled, and execute the following steps:
 
 1\. Clone dataplaneapi repository
 
@@ -71,6 +71,10 @@ HAProxy options:
   -i, --show-system-info                           Show system info on info endpoint
   -f=                                              Path to the dataplane configuration file
       --userlist-file=                             Path to the dataplaneapi userlist file. By default userlist is read from HAProxy conf. When specified userlist would be read from this file
+      --fid=                                       Path to file that will dataplaneapi use to write its id (not a pid) that was given to him after joining a cluster
+  -p, --maps-dir=                                  Path to maps directory (default: /etc/haproxy/maps)
+      --update-map-files                           Flag used for syncing map files with runtime maps values
+      --update-map-files-period=                   Elapsed time in seconds between two maps syncing operations (default: 10)
 
 Logging options:
       --log-to=[stdout|file]                       Log target, can be stdout or file (default: stdout)
@@ -96,7 +100,7 @@ You can test it by simply running:
 Test it out with curl, note that you need user/pass combination setup in HAProxy userlist in haproxy configuration (in above example: /etc/haproxy/haproxy.cfg, userlist controller):
 
 ```
-curl -u <user>:<pass> -H "Content-Type: application/json" "http://127.0.0.1:5555/v1/"
+curl -u <user>:<pass> -H "Content-Type: application/json" "http://127.0.0.1:5555/v2/"
 ```
 
 If you are using secure passwords, supported algorithms are: md5, sha-256 and sha-512.
@@ -105,7 +109,7 @@ If you are using secure passwords, supported algorithms are: md5, sha-256 and sh
 
 For more docs how to use the Data Plane API check our [documentation](https://www.haproxy.com/documentation/hapee/1-9r1/configuration/dataplaneapi/)
 
-Alternatively, dataplaneapi serves it's own interactive documentation relevant for the current build on the `/v1/docs` uri. Just point your browser to the host/port dataplane was started with (i.e. `http://localhost:5555/v1/docs`)
+Alternatively, dataplaneapi serves it's own interactive documentation relevant for the current build on the `/v2/docs` uri. Just point your browser to the host/port dataplane was started with (i.e. `http://localhost:5555/v2/docs`)
 
 ## Contributing
 
diff --git a/adapters/adapters.go b/adapters/adapters.go
index 7ac14491..0e1ad9a9 100644
--- a/adapters/adapters.go
+++ b/adapters/adapters.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/docker/go-units"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 
 	"github.com/sirupsen/logrus"
 )
diff --git a/cmd/dataplaneapi/main.go b/cmd/dataplaneapi/main.go
index b59830a1..249b339b 100644
--- a/cmd/dataplaneapi/main.go
+++ b/cmd/dataplaneapi/main.go
@@ -29,6 +29,21 @@ import (
 	"github.com/haproxytech/dataplaneapi/operations"
 )
 
+//GitRepo ...
+var GitRepo = ""
+
+//GitTag ...
+var GitTag = ""
+
+//GitCommit ...
+var GitCommit = "dev"
+
+//GitDirty ...
+var GitDirty = ".dirty"
+
+//BuildTime ...
+var BuildTime = ""
+
 func init() {
 	log.SetFormatter(&log.TextFormatter{
 		FullTimestamp: true,
diff --git a/cmd/dataplaneapi/version.go b/cmd/dataplaneapi/version.go
deleted file mode 100644
index 6f6c4705..00000000
--- a/cmd/dataplaneapi/version.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-//GitRepo ...
-var GitRepo = ""
-
-//GitTag ...
-var GitTag = ""
-
-//GitCommit ...
-var GitCommit = "dev"
-
-//GitDirty ...
-var GitDirty = ".dirty"
-
-//BuildTime ...
-var BuildTime = ""
diff --git a/configuration/cluster_sync.go b/configuration/cluster_sync.go
index 99d2cbaa..9a2cc865 100644
--- a/configuration/cluster_sync.go
+++ b/configuration/cluster_sync.go
@@ -30,7 +30,7 @@ import (
 	"net/http"
 	"time"
 
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/config-parser/v2/types"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	log "github.com/sirupsen/logrus"
diff --git a/configure_data_plane.go b/configure_data_plane.go
index 3794b171..c0242a4f 100644
--- a/configure_data_plane.go
+++ b/configure_data_plane.go
@@ -36,7 +36,7 @@ import (
 
 	"github.com/haproxytech/dataplaneapi/adapters"
 	"github.com/haproxytech/dataplaneapi/operations/specification"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 
 	log "github.com/sirupsen/logrus"
 
@@ -45,10 +45,10 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/haproxytech/dataplaneapi/operations/discovery"
 
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 
-	"github.com/haproxytech/client-native/configuration"
-	runtime_api "github.com/haproxytech/client-native/runtime"
+	"github.com/haproxytech/client-native/v2/configuration"
+	runtime_api "github.com/haproxytech/client-native/v2/runtime"
 	dataplaneapi_config "github.com/haproxytech/dataplaneapi/configuration"
 	"github.com/haproxytech/dataplaneapi/handlers"
 	"github.com/haproxytech/dataplaneapi/haproxy"
@@ -626,7 +626,7 @@ func configureRuntimeClient(confClient *configuration.Client, haproxyOptions dat
 				log.Warningf("Error setting up runtime client with master socket: %s : %s", masterSocket, err.Error())
 			}
 		}
-		runtimeAPIs := globalConf.RuntimeApis
+		runtimeAPIs := globalConf.RuntimeAPIs
 		// if no master socket set, read from first valid socket if nbproc <= 1
 		if globalConf.Nbproc <= 1 {
 			socketList := make(map[int]string)
diff --git a/doc.go b/doc.go
index 59d50249..b9629f32 100644
--- a/doc.go
+++ b/doc.go
@@ -1,5 +1,4 @@
 // Code generated by go-swagger; DO NOT EDIT.
-
 // Copyright 2019 HAProxy Technologies
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,25 @@
 // limitations under the License.
 //
 
-/*
-Package dataplaneapi HAProxy Data Plane API
-API for editing and managing haproxy instances. Provides process information, configuration management,
-haproxy stats and logs.
-
-
-
-    Schemes:
-      http
-    Host: localhost
-    BasePath: /v2
-    Version: 2.0
-    Contact: HAProxy Support<support@haproxy.com> https://my.haproxy.com/portal/cust/login
-
-    Consumes:
-    - application/json
-    - multipart/form-data
-    - text/plain
-
-    Produces:
-    - application/json
-
-swagger:meta
-*/
+// Package dataplaneapi HAProxy Data Plane API
+//
+//  API for editing and managing haproxy instances. Provides process information, configuration management,
+//  haproxy stats and logs.
+//
+//  Schemes:
+//    http
+//  Host: localhost
+//  BasePath: /v2
+//  Version: 2.0
+//  Contact: HAProxy Support<support@haproxy.com> https://my.haproxy.com/portal/cust/login
+//
+//  Consumes:
+//    - application/json
+//    - multipart/form-data
+//    - text/plain
+//
+//  Produces:
+//    - application/json
+//
+// swagger:meta
 package dataplaneapi
diff --git a/embedded_spec.go b/embedded_spec.go
index c0270f94..bdda078a 100644
--- a/embedded_spec.go
+++ b/embedded_spec.go
@@ -9164,6 +9164,19 @@ func init() {
         },
         "deny_status": {
           "type": "integer",
+          "enum": [
+            200,
+            400,
+            403,
+            405,
+            408,
+            425,
+            429,
+            500,
+            502,
+            503,
+            504
+          ],
           "x-dependency": {
             "type": {
               "value": [
@@ -12814,7 +12827,7 @@ func init() {
   },
   "security": [
     {
-      "basic_auth": null
+      "basic_auth": []
     }
   ],
   "tags": [
@@ -23905,6 +23918,401 @@ func init() {
     }
   },
   "definitions": {
+    "BackendHashType": {
+      "type": "object",
+      "properties": {
+        "function": {
+          "type": "string",
+          "enum": [
+            "sdbm",
+            "djb2",
+            "wt6",
+            "crc32"
+          ]
+        },
+        "method": {
+          "type": "string",
+          "enum": [
+            "map-based",
+            "consistent"
+          ]
+        },
+        "modifier": {
+          "type": "string",
+          "enum": [
+            "avalanche"
+          ]
+        }
+      }
+    },
+    "BackendStickTable": {
+      "type": "object",
+      "properties": {
+        "expire": {
+          "type": "integer",
+          "x-nullable": true
+        },
+        "keylen": {
+          "type": "integer",
+          "x-display-name": "Key Length",
+          "x-nullable": true
+        },
+        "nopurge": {
+          "type": "boolean",
+          "x-display-name": "No Purge"
+        },
+        "peers": {
+          "type": "string",
+          "pattern": "^[^\\s]+$"
+        },
+        "size": {
+          "type": "integer",
+          "x-nullable": true
+        },
+        "store": {
+          "type": "string",
+          "pattern": "^[^\\s]+$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "ip",
+            "ipv6",
+            "integer",
+            "string",
+            "binary"
+          ]
+        }
+      }
+    },
+    "ClusterSettingsCluster": {
+      "type": "object",
+      "title": "Cluster controller information",
+      "properties": {
+        "address": {
+          "type": "string",
+          "pattern": "^[^\\s]+$",
+          "readOnly": true
+        },
+        "api_base_path": {
+          "type": "string",
+          "readOnly": true
+        },
+        "description": {
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "port": {
+          "type": "integer",
+          "maximum": 65535,
+          "minimum": 1,
+          "x-nullable": true,
+          "readOnly": true
+        }
+      }
+    },
+    "CookieDomainItems0": {
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "string",
+          "pattern": "^[^\\s]+$"
+        }
+      },
+      "x-go-name": "Domain"
+    },
+    "GlobalCPUMapsItems0": {
+      "type": "object",
+      "required": [
+        "process",
+        "cpu_set"
+      ],
+      "properties": {
+        "cpu_set": {
+          "type": "string",
+          "x-display-name": "CPU Set"
+        },
+        "process": {
+          "type": "string",
+          "x-display-name": "Process/Thread Set"
+        }
+      },
+      "x-go-name": "CPUMap"
+    },
+    "GlobalRuntimeApisItems0": {
+      "type": "object",
+      "required": [
+        "address"
+      ],
+      "properties": {
+        "address": {
+          "type": "string",
+          "pattern": "^[^\\s]+$"
+        },
+        "exposeFdListeners": {
+          "type": "boolean",
+          "x-display-name": "Expose FD Listeners"
+        },
+        "level": {
+          "type": "string",
+          "enum": [
+            "user",
+            "operator",
+            "admin"
+          ]
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[^\\s]+$"
+        },
+        "process": {
+          "type": "string",
+          "pattern": "^[^\\s]+$"
+        }
+      },
+      "x-go-name": "RuntimeAPI"
+    },
+    "InfoAPI": {
+      "type": "object",
+      "properties": {
+        "build_date": {
+          "description": "HAProxy Dataplane API build date",
+          "type": "string",
+          "format": "date-time"
+        },
+        "version": {
+          "description": "HAProxy Dataplane API version string",
+          "type": "string"
+        }
+      }
+    },
+    "InfoSystem": {
+      "type": "object",
+      "properties": {
+        "cpu_info": {
+          "type": "object",
+          "properties": {
+            "model": {
+              "type": "string"
+            },
+            "num_cpus": {
+              "description": "Number of logical CPUs",
+              "type": "integer"
+            }
+          }
+        },
+        "hostname": {
+          "description": "Hostname where the HAProxy is running",
+          "type": "string"
+        },
+        "mem_info": {
+          "type": "object",
+          "properties": {
+            "dataplaneapi_memory": {
+              "type": "integer"
+            },
+            "free_memory": {
+              "type": "integer"
+            },
+            "total_memory": {
+              "type": "integer"
+            }
+          }
+        },
+        "os_string": {
+          "description": "OS string",
+          "type": "string"
+        },
+        "time": {
+          "description": "Current time in milliseconds since Epoch.",
+          "type": "integer"
+        },
+        "uptime": {
+          "description": "System uptime",
+          "type": "integer",
+          "x-nullable": true
+        }
+      }
+    },
+    "InfoSystemCPUInfo": {
+      "type": "object",
+      "properties": {
+        "model": {
+          "type": "string"
+        },
+        "num_cpus": {
+          "description": "Number of logical CPUs",
+          "type": "integer"
+        }
+      }
+    },
+    "InfoSystemMemInfo": {
+      "type": "object",
+      "properties": {
+        "dataplaneapi_memory": {
+          "type": "integer"
+        },
+        "free_memory": {
+          "type": "integer"
+        },
+        "total_memory": {
+          "type": "integer"
+        }
+      }
+    },
+    "SiteFarmsItems0": {
+      "type": "object",
+      "required": [
+        "name",
+        "use_as"
+      ],
+      "properties": {
+        "balance": {
+          "$ref": "#/definitions/balance"
+        },
+        "cond": {
+          "type": "string",
+          "enum": [
+            "if",
+            "unless"
+          ],
+          "x-dependency": {
+            "use_as": {
+              "required": true,
+              "value": "conditional"
+            }
+          },
+          "x-display-name": "Condition"
+        },
+        "cond_test": {
+          "type": "string",
+          "x-dependency": {
+            "use_as": {
+              "required": true,
+              "value": "conditional"
+            }
+          },
+          "x-display-name": "Condition Test"
+        },
+        "forwardfor": {
+          "$ref": "#/definitions/forwardfor"
+        },
+        "mode": {
+          "type": "string",
+          "enum": [
+            "http",
+            "tcp"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "pattern": "^[A-Za-z0-9-_.:]+$",
+          "x-nullable": false
+        },
+        "servers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/server"
+          }
+        },
+        "use_as": {
+          "type": "string",
+          "enum": [
+            "default",
+            "conditional"
+          ],
+          "x-nullable": false
+        }
+      },
+      "x-go-name": "SiteFarm"
+    },
+    "SiteService": {
+      "type": "object",
+      "properties": {
+        "http_connection_mode": {
+          "type": "string",
+          "enum": [
+            "http-tunnel",
+            "httpclose",
+            "forced-close",
+            "http-server-close",
+            "http-keep-alive"
+          ],
+          "x-dependency": {
+            "mode": {
+              "value": "http"
+            }
+          },
+          "x-display-name": "HTTP Connection Mode"
+        },
+        "listeners": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/bind"
+          }
+        },
+        "maxconn": {
+          "type": "integer",
+          "x-display-name": "Max Connections",
+          "x-nullable": true
+        },
+        "mode": {
+          "type": "string",
+          "enum": [
+            "http",
+            "tcp"
+          ]
+        }
+      }
+    },
+    "StickTableFieldsItems0": {
+      "type": "object",
+      "properties": {
+        "field": {
+          "type": "string",
+          "enum": [
+            "server_id",
+            "gpc0",
+            "gpc0_rate",
+            "gpc1",
+            "gpc1_rate",
+            "conn_cnt",
+            "conn_cur",
+            "conn_rate",
+            "sess_cnt",
+            "sess_rate",
+            "http_req_cnt",
+            "http_req_rate",
+            "http_err_cnt",
+            "http_err_rate",
+            "bytes_in_cnt",
+            "bytes_in_rate",
+            "bytes_out_cnt",
+            "bytes_out_rate"
+          ]
+        },
+        "period": {
+          "type": "integer",
+          "x-dependency": {
+            "type": {
+              "value": "rate"
+            }
+          }
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "rate",
+            "counter"
+          ]
+        }
+      },
+      "x-go-name": "StickTableField"
+    },
     "acl": {
       "description": "The use of Access Control Lists (ACL) provides a flexible solution to perform\ncontent switching and generally to take decisions based on content extracted\nfrom the request, the response or any environmental status.\n",
       "type": "object",
@@ -24589,14 +24997,7 @@ func init() {
         "domain": {
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "value": {
-                "type": "string",
-                "pattern": "^[^\\s]+$"
-              }
-            },
-            "x-go-name": "Domain"
+            "$ref": "#/definitions/CookieDomainItems0"
           },
           "x-go-name": "Domains"
         },
@@ -25391,22 +25792,7 @@ func init() {
         "cpu_maps": {
           "type": "array",
           "items": {
-            "type": "object",
-            "required": [
-              "process",
-              "cpu_set"
-            ],
-            "properties": {
-              "cpu_set": {
-                "type": "string",
-                "x-display-name": "CPU Set"
-              },
-              "process": {
-                "type": "string",
-                "x-display-name": "Process/Thread Set"
-              }
-            },
-            "x-go-name": "CPUMap"
+            "$ref": "#/definitions/GlobalCPUMapsItems0"
           },
           "x-display-name": "CPU Maps",
           "x-go-name": "CPUMaps"
@@ -25450,37 +25836,7 @@ func init() {
         "runtime_apis": {
           "type": "array",
           "items": {
-            "type": "object",
-            "required": [
-              "address"
-            ],
-            "properties": {
-              "address": {
-                "type": "string",
-                "pattern": "^[^\\s]+$"
-              },
-              "exposeFdListeners": {
-                "type": "boolean",
-                "x-display-name": "Expose FD Listeners"
-              },
-              "level": {
-                "type": "string",
-                "enum": [
-                  "user",
-                  "operator",
-                  "admin"
-                ]
-              },
-              "mode": {
-                "type": "string",
-                "pattern": "^[^\\s]+$"
-              },
-              "process": {
-                "type": "string",
-                "pattern": "^[^\\s]+$"
-              }
-            },
-            "x-go-name": "RuntimeAPI"
+            "$ref": "#/definitions/GlobalRuntimeApisItems0"
           },
           "x-display-name": "Runtime APIs",
           "x-go-name": "RuntimeAPIs"
@@ -25673,6 +26029,19 @@ func init() {
         },
         "deny_status": {
           "type": "integer",
+          "enum": [
+            200,
+            400,
+            403,
+            405,
+            408,
+            425,
+            429,
+            500,
+            502,
+            503,
+            504
+          ],
           "x-dependency": {
             "type": {
               "value": [
@@ -28227,70 +28596,7 @@ func init() {
         "farms": {
           "type": "array",
           "items": {
-            "type": "object",
-            "required": [
-              "name",
-              "use_as"
-            ],
-            "properties": {
-              "balance": {
-                "$ref": "#/definitions/balance"
-              },
-              "cond": {
-                "type": "string",
-                "enum": [
-                  "if",
-                  "unless"
-                ],
-                "x-dependency": {
-                  "use_as": {
-                    "required": true,
-                    "value": "conditional"
-                  }
-                },
-                "x-display-name": "Condition"
-              },
-              "cond_test": {
-                "type": "string",
-                "x-dependency": {
-                  "use_as": {
-                    "required": true,
-                    "value": "conditional"
-                  }
-                },
-                "x-display-name": "Condition Test"
-              },
-              "forwardfor": {
-                "$ref": "#/definitions/forwardfor"
-              },
-              "mode": {
-                "type": "string",
-                "enum": [
-                  "http",
-                  "tcp"
-                ]
-              },
-              "name": {
-                "type": "string",
-                "pattern": "^[A-Za-z0-9-_.:]+$",
-                "x-nullable": false
-              },
-              "servers": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/server"
-                }
-              },
-              "use_as": {
-                "type": "string",
-                "enum": [
-                  "default",
-                  "conditional"
-                ],
-                "x-nullable": false
-              }
-            },
-            "x-go-name": "SiteFarm"
+            "$ref": "#/definitions/SiteFarmsItems0"
           }
         },
         "name": {
@@ -28510,48 +28816,7 @@ func init() {
         "fields": {
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "field": {
-                "type": "string",
-                "enum": [
-                  "server_id",
-                  "gpc0",
-                  "gpc0_rate",
-                  "gpc1",
-                  "gpc1_rate",
-                  "conn_cnt",
-                  "conn_cur",
-                  "conn_rate",
-                  "sess_cnt",
-                  "sess_rate",
-                  "http_req_cnt",
-                  "http_req_rate",
-                  "http_err_cnt",
-                  "http_err_rate",
-                  "bytes_in_cnt",
-                  "bytes_in_rate",
-                  "bytes_out_cnt",
-                  "bytes_out_rate"
-                ]
-              },
-              "period": {
-                "type": "integer",
-                "x-dependency": {
-                  "type": {
-                    "value": "rate"
-                  }
-                }
-              },
-              "type": {
-                "type": "string",
-                "enum": [
-                  "rate",
-                  "counter"
-                ]
-              }
-            },
-            "x-go-name": "StickTableField"
+            "$ref": "#/definitions/StickTableFieldsItems0"
           }
         },
         "name": {
diff --git a/go.mod b/go.mod
index 66e3692f..26a151bd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,28 +1,28 @@
 module github.com/haproxytech/dataplaneapi
 
-go 1.12
+go 1.14
 
 require (
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/docker/go-units v0.4.0
 	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/go-openapi/errors v0.19.2
-	github.com/go-openapi/loads v0.19.3
-	github.com/go-openapi/runtime v0.19.14
-	github.com/go-openapi/spec v0.19.3
-	github.com/go-openapi/strfmt v0.19.3
-	github.com/go-openapi/swag v0.19.5
-	github.com/go-openapi/validate v0.19.3
-	github.com/haproxytech/client-native v1.2.7-0.20200424140533-634876086fb9
-	github.com/haproxytech/config-parser/v2 v2.0.1-0.20200410235413-ecffcb50b648
-	github.com/haproxytech/models v1.2.5-0.20200424101737-1c698f0d629d
+	github.com/go-openapi/errors v0.19.4
+	github.com/go-openapi/loads v0.19.5
+	github.com/go-openapi/runtime v0.19.15
+	github.com/go-openapi/spec v0.19.7
+	github.com/go-openapi/strfmt v0.19.5
+	github.com/go-openapi/swag v0.19.9
+	github.com/go-openapi/validate v0.19.8
+	github.com/haproxytech/client-native/v2 v2.0.0
+	github.com/haproxytech/config-parser/v2 v2.0.1
+	github.com/haproxytech/models/v2 v2.0.0
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/oklog/ulid v1.3.1
 	github.com/rs/cors v1.7.0
-	github.com/shirou/gopsutil v2.20.2+incompatible
+	github.com/shirou/gopsutil v2.20.3+incompatible
 	github.com/sirupsen/logrus v1.5.0
-	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
-	golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
-	gopkg.in/yaml.v2 v2.2.4
+	golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0
+	golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f
+	gopkg.in/yaml.v2 v2.2.8
 )
diff --git a/go.sum b/go.sum
index 96bf9e46..8a43e42b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,6 @@
-github.com/GehirnInc/crypt v0.0.0-20190301055215-6c0105aabd46 h1:rs0kDBt2zF4/CM9rO5/iH+U22jnTygPlqWgX55Ufcxg=
-github.com/GehirnInc/crypt v0.0.0-20190301055215-6c0105aabd46/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaaSyd+DyQRrsQjhbSeS7qe4nEw8aQw=
 github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo=
-github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -10,433 +8,249 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
+github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
+github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
+github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-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/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb h1:D4uzjWwKYQ5XnAvUbuvHW93esHg7F8N/OYeBBcJoTr0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
-github.com/go-openapi/analysis v0.17.0 h1:8JV+dzJJiK46XqGLqqLav8ZfEiJECp8jlOFhpiCdZ+0=
 github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.18.0 h1:hRMEymXOgwo7KLPqqFmw6t3jLO2/zxUe/TXjAHPq9Gc=
 github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
 github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.5 h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI=
 github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
+github.com/go-openapi/analysis v0.19.10 h1:5BHISBAXOc/aJK25irLZnx2D3s6WyYaY9D4gmuz9fdE=
+github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ=
 github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.0 h1:guf3T2lnCBKlODmERt4T9GtMWRpJOikgKGyIvi0xcb8=
-github.com/go-openapi/errors v0.19.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
 github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
+github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/errors v0.19.4 h1:fSGwO1tSYHFu70NKaWJt5Qh0qoBRtCm/mXS1yhf+0W0=
+github.com/go-openapi/errors v0.19.4/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.18.0 h1:KVRzjXpMzgdM4GEMDmDTnGcY5yBwGWreJwmmk4k35yU=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.18.0 h1:oP2OUNdG1l2r5kYhrfVMXO54gWmzcfAwP/GFuHpNTkE=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/loads v0.17.0 h1:H22nMs3GDQk4SwAaFQ+jLNw+0xoFeCueawhZlv8MBYs=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.0 h1:wCOBNscACI8L93tt5tvB2zOMkJ098XCw3fP0BY2ybDA=
 github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-github.com/go-openapi/loads v0.19.3 h1:jwIoahqCmaA5OBoc/B+1+Mu2L0Gr8xYQnbeyQEo/7b0=
 github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI=
-github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9 h1:zXd+rkzHwMIYVTJ/j/v8zUQ9j3Ir32gC5Dn9DzZVvCk=
+github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk=
+github.com/go-openapi/loads v0.19.5 h1:jZVYWawIQiA1NBnHla28ktg6hrcfTHsCE+3QLVRBIls=
+github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY=
 github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
-github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE=
 github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
 github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
-github.com/go-openapi/runtime v0.19.14 h1:/k1/W4Cgs73kOdlPCaZCu77jC1FHhNY6sUOnVvtOX94=
-github.com/go-openapi/runtime v0.19.14/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
-github.com/go-openapi/spec v0.17.0 h1:XNvrt8FlSVP8T1WuhbAFF6QDhJc0zsoWzX4wXARhhpE=
+github.com/go-openapi/runtime v0.19.15 h1:2GIefxs9Rx1vCDNghRtypRq+ig8KSLrjHbAYI/gCLCM=
+github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
 github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.19.0 h1:A4SZ6IWh3lnjH0rG0Z5lkxazMGBECtrZcbyYQi+64k4=
-github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
+github.com/go-openapi/spec v0.19.7 h1:0xWSeMd35y5avQAThZR2PkEuqSosoS5t6gDH4L8n11M=
+github.com/go-openapi/spec v0.19.7/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.19.0 h1:0Dn9qy1G9+UJfRU7TR8bmdGxb4uifB7HNrJjOnV0yPk=
 github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
 github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA=
 github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
+github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
+github.com/go-openapi/strfmt v0.19.5 h1:0utjKrw+BAh8s57XE9Xz8DUBsVvPmRUB6styvl9wWIM=
+github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.19.0 h1:Kg7Wl7LkTPlmc393QZQ/5rQadPhi7pBVEMZxyTi0Ii8=
-github.com/go-openapi/swag v0.19.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
+github.com/go-openapi/swag v0.19.9 h1:1IxuqvBUU3S2Bi4YC7tlP9SJF1gVpCvqN0T2Qof4azE=
+github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
-github.com/go-openapi/validate v0.19.0 h1:SF5vyj6PBFM6D1cw2NJIFrlS8Su2YKk6ADPPjAH70Bw=
-github.com/go-openapi/validate v0.19.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-openapi/validate v0.19.3 h1:PAH/2DylwWcIU1s0Y7k3yNmeAgWOcKrNE2Q7Ww/kCg4=
 github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
+github.com/go-openapi/validate v0.19.8 h1:YFzsdWIDfVuLvIOF+ZmKjVg1MbPJ1QgY9PihMwei1ys=
+github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
+github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
+github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
+github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
+github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
+github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
+github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
+github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
+github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
+github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
+github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
+github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
+github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/haproxytech/client-native v1.2.3 h1:/i2Tkn4sMABWQWXNWpQQ68Zto0rE5jmsXcGJ5jGF80o=
-github.com/haproxytech/client-native v1.2.3/go.mod h1:VcZdVPpnqyeQJcgOqD0onws4PfU0702fP58V7zO8LnE=
-github.com/haproxytech/client-native v1.2.4 h1:M/gzlYixGGItcjobBS1QQFdp+Hqufe/djcSqPBHHa50=
-github.com/haproxytech/client-native v1.2.4/go.mod h1:pJeEyNF4+sZpBrm4rCH263PcBpJyYN+JDjOQleWcW5M=
-github.com/haproxytech/client-native v1.2.5-0.20190823115908-abc6e1722a52 h1:8Bd005lWCNfUOb7607o3amQahBkqWvzpo3+sqThOwWk=
-github.com/haproxytech/client-native v1.2.5-0.20190823115908-abc6e1722a52/go.mod h1:WsLizjzTjRwzqm7RlKTutJHvSbLMwyKVMCww7u3Jpzo=
-github.com/haproxytech/client-native v1.2.5 h1:bTsiws1J66wIedGLKtvrzO5hAww6TCTf9zzp89NalQk=
-github.com/haproxytech/client-native v1.2.5/go.mod h1:WsLizjzTjRwzqm7RlKTutJHvSbLMwyKVMCww7u3Jpzo=
-github.com/haproxytech/client-native v1.2.6-0.20191004065443-7098fd623688 h1:Zih8StutXQE/KIDIIwzWHdGTkm0Kfeohk26mynRoWIQ=
-github.com/haproxytech/client-native v1.2.6-0.20191004065443-7098fd623688/go.mod h1:GKKH8rBT+qaC6Br8RbIif3lvQK1bnbqmoiv0KtP6Bvs=
-github.com/haproxytech/client-native v1.2.6-0.20191004134249-74efe2bd67ea h1:BYs+E6bAQoz8KgmkjDjBcpq49ifj+nGqSkYQyGn8gSM=
-github.com/haproxytech/client-native v1.2.6-0.20191004134249-74efe2bd67ea/go.mod h1:GKKH8rBT+qaC6Br8RbIif3lvQK1bnbqmoiv0KtP6Bvs=
-github.com/haproxytech/client-native v1.2.6-0.20191009080518-a66b8506357e h1:9b/JmkKgZjXplVc081mBsnWyoRykh8KQ0D7gZ8987pM=
-github.com/haproxytech/client-native v1.2.6-0.20191009080518-a66b8506357e/go.mod h1:iZogi0TuU/0cs7//YJGKihba2je60gQghH12izKHF8Q=
-github.com/haproxytech/client-native v1.2.6 h1:h6ToCiUuKign1wTW71WicI6Jzs75CLT/NVIBH2epeMs=
-github.com/haproxytech/client-native v1.2.6/go.mod h1:7EUfsYlRhfoiffrF6Tg0hmvzjxp665ImajpPGsPJzVY=
-github.com/haproxytech/client-native v1.2.7-0.20191014073021-13f38a2fe6e0 h1:95ANXV/Vi/EpHkDws4kmmG3A3SoS+Iq4HA7wzHtF5Oc=
-github.com/haproxytech/client-native v1.2.7-0.20191014073021-13f38a2fe6e0/go.mod h1:d3YkFk9CotqL3P628STS7pEuuCyOYLL+sXrjjJxWFug=
-github.com/haproxytech/client-native v1.2.7-0.20191014091556-b685939d54e9 h1:NuXyp+8vfgJ/ESp69qS0geWbCqBB3qb1Ls0Jk8GqqDE=
-github.com/haproxytech/client-native v1.2.7-0.20191014091556-b685939d54e9/go.mod h1:KOOeLJgjqDoU25LVmAYaXRxQcv510Ju5nBK2xdgDMek=
-github.com/haproxytech/client-native v1.2.7-0.20191014093528-779cd403980d h1:/3+IjJs+zR9vnI3bMbfEXDzD/7uCPcHuAckoLDhGWms=
-github.com/haproxytech/client-native v1.2.7-0.20191014093528-779cd403980d/go.mod h1:KOOeLJgjqDoU25LVmAYaXRxQcv510Ju5nBK2xdgDMek=
-github.com/haproxytech/client-native v1.2.7-0.20191014132956-b019aa5097ae h1:/d/4oc376+HV0VsGker31ulJvcitVI6YyaTY4PsuNdc=
-github.com/haproxytech/client-native v1.2.7-0.20191014132956-b019aa5097ae/go.mod h1:kl0ubY5UlRzwEg16V2BxJ7X/IHs7RmfnalH9go4RXg8=
-github.com/haproxytech/client-native v1.2.7-0.20191014153656-58925cb6d068 h1:v+bn2t2tqgOhY4/Ltfc2CBimNzo4G99AWYvT0CWJVus=
-github.com/haproxytech/client-native v1.2.7-0.20191014153656-58925cb6d068/go.mod h1:3HRzUy3T7tzc47sLMS14g+G+jeKCrCK/S2UgpQ9ZuTg=
-github.com/haproxytech/client-native v1.2.7-0.20191015141253-fd2f43e23fee h1:MLfIISQOY2w2FkBGBIBXHlbyRASu/1rNQah3cc82Wk4=
-github.com/haproxytech/client-native v1.2.7-0.20191015141253-fd2f43e23fee/go.mod h1:JI/mJCwPKG9UQpna3LQ8HfDkiiZBW+464sArdHm/cQI=
-github.com/haproxytech/client-native v1.2.7-0.20191016093421-0bff8db25d35 h1:mgjRFC0ZYvqgqpnUUX2ckkryqvcnqhjb9x4JuhW3T1A=
-github.com/haproxytech/client-native v1.2.7-0.20191016093421-0bff8db25d35/go.mod h1:KNtCN/lwxX8KBHliGtdLPlxyHjV2LZ2j70y3wJB1ei8=
-github.com/haproxytech/client-native v1.2.7-0.20191016130928-5ef0b55e0742 h1:cOekLn7Do0yKVKAcBOlFloLc74Fr7hVbLuf0PGEzEZs=
-github.com/haproxytech/client-native v1.2.7-0.20191016130928-5ef0b55e0742/go.mod h1:WFcFLfZzxDApXuLemVnA/+mLxdmYMKbeOmSSzlSgZ40=
-github.com/haproxytech/client-native v1.2.7-0.20191021102533-a31afb889101 h1:y3jro+EziL3b0+l5WGD7lR8pwI7iQA0Rwo/a6/xDpe4=
-github.com/haproxytech/client-native v1.2.7-0.20191021102533-a31afb889101/go.mod h1:WFcFLfZzxDApXuLemVnA/+mLxdmYMKbeOmSSzlSgZ40=
-github.com/haproxytech/client-native v1.2.7-0.20191022102039-9508a2bf83d2 h1:vWKabWKOt07NKQlnZUkv+tyqaP9yYu8syvUsDNAF5E8=
-github.com/haproxytech/client-native v1.2.7-0.20191022102039-9508a2bf83d2/go.mod h1:boELGwsljDHz/tu7r507JcG6xyXeLw/xvvQW2vMH9Y0=
-github.com/haproxytech/client-native v1.2.7-0.20191022134335-7e045e787bf4 h1:vZx50j3Dq0uG25XTeq/7m+Dnrh8XTyEln4wGWMagpps=
-github.com/haproxytech/client-native v1.2.7-0.20191022134335-7e045e787bf4/go.mod h1:fgBtlORfJ6MUp43Q4xnO8sbE/eNDQB2Oa6aODgySAUo=
-github.com/haproxytech/client-native v1.2.7-0.20191023121740-a209bd73c61c h1:ZFu6qqxxFc+4dg5Tnd3eWV8MTVt5RnDaTwxzzj9n1wI=
-github.com/haproxytech/client-native v1.2.7-0.20191023121740-a209bd73c61c/go.mod h1:fgBtlORfJ6MUp43Q4xnO8sbE/eNDQB2Oa6aODgySAUo=
-github.com/haproxytech/client-native v1.2.7-0.20191028132958-75fd212d2b94 h1:gMmt3dQzjK+PqpURwHVckaq22Y3nwzp766qfIP+A9aY=
-github.com/haproxytech/client-native v1.2.7-0.20191028132958-75fd212d2b94/go.mod h1:LpvrDt1Ofikk/xE0J3iDfd/hMm22nlnY5LWK6OocJGE=
-github.com/haproxytech/client-native v1.2.7-0.20191031100812-1ff45bfb5d0d h1:Ia2xySzFFWyyoaD/WA7HgFa1WB3gC9KTYbsCbnfLzDM=
-github.com/haproxytech/client-native v1.2.7-0.20191031100812-1ff45bfb5d0d/go.mod h1:pQ98oAkDTqx9F+WSoTtcc2fXct+KktxxFh0LpTwP5c8=
-github.com/haproxytech/client-native v1.2.7-0.20191104105101-e7b8f3d484a1 h1:gu09dhR8js5D0Ex4nPk3D/mEps7CD/vNKtcetXYyYNo=
-github.com/haproxytech/client-native v1.2.7-0.20191104105101-e7b8f3d484a1/go.mod h1:dlgoSojtTJ76vlMDd7tpCfDBtuhxlB5hMyjTkLN6eW0=
-github.com/haproxytech/client-native v1.2.7-0.20191120125416-8a71e2e43fab h1:01Ybtj795wz188kyjEULBJD9hsFh35b3rOTaDTId3bo=
-github.com/haproxytech/client-native v1.2.7-0.20191120125416-8a71e2e43fab/go.mod h1:a8pS+qqtPY3QZd6Un55wqRYyQqBnC9+MQNQcwFowd50=
-github.com/haproxytech/client-native v1.2.7-0.20191217130835-14ede1c6fe8f h1:XXunMV0KMmqOStz+aW0tj06LVCk+kN5GbHbsBPQlnTg=
-github.com/haproxytech/client-native v1.2.7-0.20191217130835-14ede1c6fe8f/go.mod h1:atz4AQN48AwLWvo40xcXSsIuQ3igxtB2MoYp40sOezA=
-github.com/haproxytech/client-native v1.2.7-0.20200110111235-5e26522b5467 h1:odNf+86MpA50bITHFxBUHGhRJ1vfLjA+80+FQKp5niU=
-github.com/haproxytech/client-native v1.2.7-0.20200110111235-5e26522b5467/go.mod h1:PqOj2XpsU227JFWSUQmc03OMHjJnAjBi180HglRDAkA=
-github.com/haproxytech/client-native v1.2.7-0.20200210115012-596fd9328d89 h1:nEe7ST8hK323iOpMY5v4ATimtUHO//2aFR4l0W74vwc=
-github.com/haproxytech/client-native v1.2.7-0.20200210115012-596fd9328d89/go.mod h1:vAGfwQ7awpiAeY19s1P36iEvLLE5dgy8sdOy+gOnfoY=
-github.com/haproxytech/client-native v1.2.7-0.20200320143825-3a0b0c71ffbd h1:WPVmtdfibNVdOD6Hi5Fli2gGYGVupUdOJaUAEC04avI=
-github.com/haproxytech/client-native v1.2.7-0.20200320143825-3a0b0c71ffbd/go.mod h1:KjmLHfR59KB4Jr4mle2TWVmKINKdqNVwLggZRezWIsQ=
-github.com/haproxytech/client-native v1.2.7-0.20200324170254-d62d3b0318a7 h1:EZvgNDLf+GYjf3r980b2O5Uwvx1MJxh7BEBlY+evTqA=
-github.com/haproxytech/client-native v1.2.7-0.20200324170254-d62d3b0318a7/go.mod h1:8HGpDvXXTQbE1nd/ZHLcpMxvPL+nKTvzrrp80Auyrh0=
-github.com/haproxytech/client-native v1.2.7-0.20200328134549-7c3fcf2ef8ab h1:CqNfE4X/mT2FVzwq8Q2KM333FFdDQ4FNFOXl9hISCzc=
-github.com/haproxytech/client-native v1.2.7-0.20200328134549-7c3fcf2ef8ab/go.mod h1:7kKAljN01InQRvDk7DZLtrds9/yq+AGLCiPKe5iLScg=
-github.com/haproxytech/client-native v1.2.7-0.20200329102038-ffcb954f4e4a h1:HEZSiZ+G4wSWUbi8nHIVj6kRKYsq1V5Uc/DQQn5UA6c=
-github.com/haproxytech/client-native v1.2.7-0.20200329102038-ffcb954f4e4a/go.mod h1:SQF+X4POIiSb2H8bACCDV9AnScJBoJnp6PVp7UTXD6w=
-github.com/haproxytech/client-native v1.2.7-0.20200330083709-3b5a57776c47 h1:GsCsBnR2vYkyQalFNS0zBjqmXKD9nje6rVG0rdQiUUs=
-github.com/haproxytech/client-native v1.2.7-0.20200330083709-3b5a57776c47/go.mod h1:v8ZlROFx4AQbl7m9QNu7YLTLOD6NA6Gfe6LpTu5Eu0E=
-github.com/haproxytech/client-native v1.2.7-0.20200331172134-ea6e2ed6a97c h1:EvCU87xzphOTqX8DmICo37VRN+bdN3C8cOUkmDX96hU=
-github.com/haproxytech/client-native v1.2.7-0.20200331172134-ea6e2ed6a97c/go.mod h1:5EYS/hpavQl9M37DLcllGL1oP0csNwxOvWooBn3x0xs=
-github.com/haproxytech/client-native v1.2.7-0.20200402140848-4bfd3c2074a8 h1:+HTWb2rRgVobdt+HW5WFKV2lEXN8UtjSI/d8F2gWk68=
-github.com/haproxytech/client-native v1.2.7-0.20200402140848-4bfd3c2074a8/go.mod h1:5EYS/hpavQl9M37DLcllGL1oP0csNwxOvWooBn3x0xs=
-github.com/haproxytech/client-native v1.2.7-0.20200403123524-f37f24263555 h1:ZUh+Nm5CaNiItConL4rSsXh914OAc1jYPmppfxdtv9g=
-github.com/haproxytech/client-native v1.2.7-0.20200403123524-f37f24263555/go.mod h1:5EYS/hpavQl9M37DLcllGL1oP0csNwxOvWooBn3x0xs=
-github.com/haproxytech/client-native v1.2.7-0.20200406121239-e7f8f1f45181 h1:C+VsB8oKpDX/fXPNeLJ2n8QJEL5cSkZNS6rvlMk1K9E=
-github.com/haproxytech/client-native v1.2.7-0.20200406121239-e7f8f1f45181/go.mod h1:5EYS/hpavQl9M37DLcllGL1oP0csNwxOvWooBn3x0xs=
-github.com/haproxytech/client-native v1.2.7-0.20200406122222-3b5b737ad7ce h1:wvCvKK7bThxedA94DC+qmTRpKgJsqUTZa/CkBg2pARk=
-github.com/haproxytech/client-native v1.2.7-0.20200406122222-3b5b737ad7ce/go.mod h1:5EYS/hpavQl9M37DLcllGL1oP0csNwxOvWooBn3x0xs=
-github.com/haproxytech/client-native v1.2.7-0.20200415160017-68b4b79e74c6 h1:8qq6FTCVXZxLc8xEGIBfQUKq6QDoDyyjaCuMzYEXRD0=
-github.com/haproxytech/client-native v1.2.7-0.20200415160017-68b4b79e74c6/go.mod h1:5U2zQ/eCNSAhmT3mj36dVtxXAxXp0Csp3D4atiowdtc=
-github.com/haproxytech/client-native v1.2.7-0.20200424140533-634876086fb9 h1:I00AUGmpOd8zkhNOXdyg7GwxfdyDAbfbgqRhrMHEnZY=
-github.com/haproxytech/client-native v1.2.7-0.20200424140533-634876086fb9/go.mod h1:Hs06WBIgdtUUZuJbtMUXP/C1cO5uk1nDHL7uw9+VZLQ=
-github.com/haproxytech/config-parser v1.1.3 h1:8G+XQ7QXGctmeQlgg9xME0WMY0TK7pZenf/DZM/QWfo=
-github.com/haproxytech/config-parser v1.1.3/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser v1.1.4 h1:J9ziufMtKSemiHILPu3GgAopuhA8bMxxR1f0kGtgnHk=
-github.com/haproxytech/config-parser v1.1.4/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser v1.1.5 h1:3sA/k2klE9MpZtv05eGBD4J3JWMUzam9CM/cJoteSFo=
-github.com/haproxytech/config-parser v1.1.5/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser v1.1.9 h1:79+CVUkcVbmcWzQZ594O5BI0qYzihoOSfvzJ104OoJg=
-github.com/haproxytech/config-parser v1.1.9/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser v1.1.10 h1:dcqTi/3W1VDiPHvH5ASL1uV8YWMNaNI7XEmHZNT0kCg=
-github.com/haproxytech/config-parser v1.1.10/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser v1.1.11-0.20191010080921-251bc0c7bdac h1:snL1q+Qyjuqq7qp6izRLeLnMTd5el0pDPRTvhfq5F28=
-github.com/haproxytech/config-parser v1.1.11-0.20191010080921-251bc0c7bdac/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser v1.2.0 h1:CxiGZ2Camy8+SdKW6/fIhXzB+Nqlf8AY+/t+M8Ht8L4=
-github.com/haproxytech/config-parser v1.2.0/go.mod h1:se7v728KDunj+qz1kXFFFl+nDuoBdUaN5eYSi+gYjNM=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev1 h1:YbQt+o8KkzxqXWKzAJXWv4xav4+PuxT9jtfouCAOUzo=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev1/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev3 h1:O5QPDR2VQrBHzhanmAZo7QwdCIQTEQfQNXpSS4g3sn8=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev3/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev5 h1:aLa/jjVM2UO71AFS90SMC1l6ogwQGdSxBgWJrNttA7Y=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev5/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev6 h1:AX5CWFE85UDt7PEn8mvJsNYx19uGbdcXzV9T1xEM+K0=
-github.com/haproxytech/config-parser/v2 v2.0.0-dev6/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.0-rc1.0.20200324161901-0451bee56762 h1:IYeb1P3/nJJqSkXidkG9gyLVcSHkKLY1HpJTgo6/sy8=
-github.com/haproxytech/config-parser/v2 v2.0.0-rc1.0.20200324161901-0451bee56762/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.0-rc2.0.20200327120530-f47020fbf2f0 h1:p5jUHXxM2jDSplqbVl2i+5Xk1PVOD8u956ZdHyJd3MM=
-github.com/haproxytech/config-parser/v2 v2.0.0-rc2.0.20200327120530-f47020fbf2f0/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.0-rc2.0.20200330144517-5cf21c7b3a77 h1:BsUn0Avx5qVHEwyx5BURv73wyxqaPMG5YToPyWcy1qE=
-github.com/haproxytech/config-parser/v2 v2.0.0-rc2.0.20200330144517-5cf21c7b3a77/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/config-parser/v2 v2.0.1-0.20200410235413-ecffcb50b648 h1:R+Jy/LygGyviQ/DCbayHTpExIIS0C2mishi953/p9tc=
-github.com/haproxytech/config-parser/v2 v2.0.1-0.20200410235413-ecffcb50b648/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
-github.com/haproxytech/models v1.2.1/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.2 h1:/lXf0e3zCF4jCH+QZ9LfcCS2YXPRXFrQrWWTirL6gOY=
-github.com/haproxytech/models v1.2.2/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.3-0.20190823114805-b3bd06b1c569 h1:uSIImvE2nSiEqMvesozR0cF90I0Gys8Rl6uEItGMZbw=
-github.com/haproxytech/models v1.2.3-0.20190823114805-b3bd06b1c569/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.3 h1:g0ac/TkUKjRCzx3AQwHZSJzUKVCZlmSn7UcA/+eDzio=
-github.com/haproxytech/models v1.2.3/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.4-0.20190924151828-3388735e4d3a h1:1HKlqzi0gHs+suoFZfXv6GQ14+U/0dyQbydaEN0ZzVg=
-github.com/haproxytech/models v1.2.4-0.20190924151828-3388735e4d3a/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.4-0.20191004062656-5bd0f64c765b h1:HA9wpdMbDsT/A5z5L6McXLDh8yiSfwxK32PRwx/F1to=
-github.com/haproxytech/models v1.2.4-0.20191004062656-5bd0f64c765b/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.4-0.20191009071622-2e6a8ecf1d8e h1:UlPkQ90yhiNgT2adfzgcGytWYAp7+pleCSexRdH48Ow=
-github.com/haproxytech/models v1.2.4-0.20191009071622-2e6a8ecf1d8e/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.4 h1:KYWMzEVVRxAPI6F64xF6oISY10TGm6VWvo/T2rXp4x4=
-github.com/haproxytech/models v1.2.4/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.19700101000000-63e95d6c3624 h1:9TeDi+fn1hw+G72rToAmwbEWcz/uULJZhkVAtw3bR2o=
-github.com/haproxytech/models v1.2.5-0.19700101000000-63e95d6c3624/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191014071538-306b0b122d42 h1:Yp0oKt9wE2NDNBGUKUR+dgpiQ+6i04/WkcDp+M5CIJY=
-github.com/haproxytech/models v1.2.5-0.20191014071538-306b0b122d42/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191014074611-afc4060df863 h1:+11bo6uZr97ZLf0+yo9rBms8+bGqCGf9aTz2Vg3X68A=
-github.com/haproxytech/models v1.2.5-0.20191014074611-afc4060df863/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191014095528-ac55cbc13783 h1:Rss3B2VIwgLjHMuNiki0osAYYmVJlafMij4jqMENGaQ=
-github.com/haproxytech/models v1.2.5-0.20191014095528-ac55cbc13783/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191014152757-1080a77cbac7 h1:jrwnv559loPKl4EgFT1J5wNmkI+KsBo01Khqgfgjp8Q=
-github.com/haproxytech/models v1.2.5-0.20191014152757-1080a77cbac7/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191016093115-17c8e105a037 h1:NcVoOGnYZ61rmlMi6rQXLW8XMLWB4+GqNQhP//I6rUM=
-github.com/haproxytech/models v1.2.5-0.20191016093115-17c8e105a037/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191016125350-d58ad61b7796 h1:Xg9OwexneLXZarvMhUx+Z/TIKMCUhGOH03ylQ+g8uAE=
-github.com/haproxytech/models v1.2.5-0.20191016125350-d58ad61b7796/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191022101727-c120a7db6e37 h1:kmc2xF9sWBH55Lbk2gcfHQxjW4IrtZ5t2zs76WoZU1Q=
-github.com/haproxytech/models v1.2.5-0.20191022101727-c120a7db6e37/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191022134201-aaee72f14d7b h1:Cd7QHpht8UZU5DoEqjcDgOvg3GIplDnvJxLYuBHJtUo=
-github.com/haproxytech/models v1.2.5-0.20191022134201-aaee72f14d7b/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191028111010-e970882e5217 h1:w0eBCQM1h2oQs8VHqUn12iGXFRHL4npqVGvCnM8A12k=
-github.com/haproxytech/models v1.2.5-0.20191028111010-e970882e5217/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191031094129-685a322a8b49 h1:Kyp/O66OdlgeCvZNzNhSVmmacASYB+k/AYOTX85Um/M=
-github.com/haproxytech/models v1.2.5-0.20191031094129-685a322a8b49/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191104104934-518cfec95f5b h1:uWKus7GKxqBwGyl363i4IpH/LzW/wab31yTSIXEJf0A=
-github.com/haproxytech/models v1.2.5-0.20191104104934-518cfec95f5b/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191119093343-0605e7733eed h1:xyI1hMK4BsEbULJgLH1vSAmgmH3gAU2HkXWBanbp+Mk=
-github.com/haproxytech/models v1.2.5-0.20191119093343-0605e7733eed/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191211111354-c547251a48ee h1:yeDsoG86gSGIgQc3WpohD/scrFoKLEaUbPO5CfgEN9c=
-github.com/haproxytech/models v1.2.5-0.20191211111354-c547251a48ee/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20191219083202-da92d6657b87 h1:Ac2WNf6IH8QbyKtEiJCf6quUpif7iMCcBziqlptfsSc=
-github.com/haproxytech/models v1.2.5-0.20191219083202-da92d6657b87/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200203135110-669f7648831e h1:qDlw+W8PjaLSCDfcF5KpbDvvghKt1Iwr5tzOaYdtOaI=
-github.com/haproxytech/models v1.2.5-0.20200203135110-669f7648831e/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200320093729-54f50e1ddd7a h1:LwcgB6jr8SbcTeMXbjprGADieCd0AFaz8V5fQ1Vkp5o=
-github.com/haproxytech/models v1.2.5-0.20200320093729-54f50e1ddd7a/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200328133847-aab4b9d6c003 h1:Fflc9iQt1cIFMYJDm/guANXZ3+rrXpXTuwMBrhjGZzU=
-github.com/haproxytech/models v1.2.5-0.20200328133847-aab4b9d6c003/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200329095951-ad7998a0a7d2 h1:h85nps934ktEXNOWsBpAcreqrNBsvyMrXYKg9tJ7ZCs=
-github.com/haproxytech/models v1.2.5-0.20200329095951-ad7998a0a7d2/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200330082755-74167020e22d h1:Ghjr6SvuYKmJg366CgybluN1tOq9DwyqOIxQs/FSjkc=
-github.com/haproxytech/models v1.2.5-0.20200330082755-74167020e22d/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200331170001-c1f211881473 h1:dSH3RFW5UyzSsAW6JvGD80eUfdnz9GGRuIOQxha78eM=
-github.com/haproxytech/models v1.2.5-0.20200331170001-c1f211881473/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200414103449-1ad77053aff9 h1:okNyn0EK24pbO+cRr7qLm0ai48mYUwMoBAtQiuz2qBM=
-github.com/haproxytech/models v1.2.5-0.20200414103449-1ad77053aff9/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/haproxytech/models v1.2.5-0.20200424101737-1c698f0d629d h1:4ZwyFK7FhdZWSq+yGjwtq3uMf81Iq+J/jPLnQJ3s8ag=
-github.com/haproxytech/models v1.2.5-0.20200424101737-1c698f0d629d/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/haproxytech/client-native/v2 v2.0.0 h1:kWwfsM7u/L4mJ3AQW+9E0wzcwoY6eA1bq2KJWYlS7Dk=
+github.com/haproxytech/client-native/v2 v2.0.0/go.mod h1:+cVzv7MaoF68Jz5CuXmdjnui9a1mGCwl1VcCVgXZ9Js=
+github.com/haproxytech/config-parser/v2 v2.0.1 h1:737eWpu+qKCiEx8caeXdvIq599qKCBd18Lc9+zyzgx0=
+github.com/haproxytech/config-parser/v2 v2.0.1/go.mod h1:VjHOetXAJtwrtLAJPoDaD/kEYwCoixVp5SCsBitMcj8=
+github.com/haproxytech/models/v2 v2.0.0 h1:okLkj9Ht5D2UnDe46huyf2TfP/mAdhTE8cB3u91nWhY=
+github.com/haproxytech/models/v2 v2.0.0/go.mod h1:HjM8x+j1/j4nHUA5lqh159OPZ3zQ5iGz13vHo9xeEk0=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
+github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe h1:W/GaMY0y69G4cFlmsC6B9sbuo2fP8OFP1ABjt4kPz+w=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
+github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4=
+github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
-github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
+github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
-github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
+github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil v2.18.12+incompatible h1:1eaJvGomDnH74/5cF4CTmTbLHAriGFsTZppLXDX93OM=
-github.com/shirou/gopsutil v2.18.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil v2.20.2+incompatible h1:ucK79BhBpgqQxPASyS2cu9HX8cfDVljBN1WWFvbNvgY=
-github.com/shirou/gopsutil v2.20.2+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
-github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/shirou/gopsutil v2.20.3+incompatible h1:0JVooMPsT7A7HqEYdydp/OfjSOYSjhXV7w1hkKj/NPQ=
+github.com/shirou/gopsutil v2.20.3+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
 github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
-github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.1 h1:Sq1fR+0c58RME5EoqKdjkiQAmPjmfHlZOoRI6fTUOcs=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
+go.mongodb.org/mongo-driver v1.3.2 h1:IYppNjEV/C+/3VPbhHVxQ4t04eVW0cLp0/pNdW++6Ug=
+go.mongodb.org/mongo-driver v1.3.2/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190607181551-461777fb6f67 h1:rJJxsykSlULwd2P2+pg/rtnwN2FrWp4IuCxOSyS0V00=
-golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U=
+golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8=
+golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
-gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
-gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/handlers/acl.go b/handlers/acl.go
index 57795d27..8cd5ab22 100644
--- a/handlers/acl.go
+++ b/handlers/acl.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/acl"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateACLHandlerImpl implementation of the CreateACLHandler interface using client-native client
diff --git a/handlers/backend.go b/handlers/backend.go
index ec3c330e..9ba51769 100644
--- a/handlers/backend.go
+++ b/handlers/backend.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/backend"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateBackendHandlerImpl implementation of the CreateBackendHandler interface using client-native client
diff --git a/handlers/backend_switching_rule.go b/handlers/backend_switching_rule.go
index c37e4288..42f63e29 100644
--- a/handlers/backend_switching_rule.go
+++ b/handlers/backend_switching_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/backend_switching_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateBackendSwitchingRuleHandlerImpl implementation of the CreateBackendSwitchingRuleHandler interface using client-native client
diff --git a/handlers/bind.go b/handlers/bind.go
index fc980f35..a5bb92d2 100644
--- a/handlers/bind.go
+++ b/handlers/bind.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/bind"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateBindHandlerImpl implementation of the CreateBindHandler interface using client-native client
diff --git a/handlers/cluster.go b/handlers/cluster.go
index ca348964..cfa084de 100644
--- a/handlers/cluster.go
+++ b/handlers/cluster.go
@@ -22,7 +22,7 @@ import (
 	"github.com/haproxytech/dataplaneapi/configuration"
 	"github.com/haproxytech/dataplaneapi/operations/cluster"
 	"github.com/haproxytech/dataplaneapi/operations/discovery"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateClusterHandlerImpl implementation of the CreateClusterHandler interface
diff --git a/handlers/defaults.go b/handlers/defaults.go
index 9536de64..8bf3523e 100644
--- a/handlers/defaults.go
+++ b/handlers/defaults.go
@@ -17,9 +17,9 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/operations/defaults"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
diff --git a/handlers/filter.go b/handlers/filter.go
index 38ed8fdb..f075d13d 100644
--- a/handlers/filter.go
+++ b/handlers/filter.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/filter"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateFilterHandlerImpl implementation of the CreateFilterHandler interface using client-native client
diff --git a/handlers/frontend.go b/handlers/frontend.go
index 1db2e55b..da7bee3d 100644
--- a/handlers/frontend.go
+++ b/handlers/frontend.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/frontend"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateFrontendHandlerImpl implementation of the CreateFrontendHandler interface using client-native client
diff --git a/handlers/global.go b/handlers/global.go
index e75546db..6166428c 100644
--- a/handlers/global.go
+++ b/handlers/global.go
@@ -17,9 +17,9 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/operations/global"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
diff --git a/handlers/http_request_rule.go b/handlers/http_request_rule.go
index ec3a2155..a5edd7d6 100644
--- a/handlers/http_request_rule.go
+++ b/handlers/http_request_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/http_request_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateHTTPRequestRuleHandlerImpl implementation of the CreateHTTPRequestRuleHandler interface using client-native client
diff --git a/handlers/http_response_rule.go b/handlers/http_response_rule.go
index a2d6e5c3..2ed5e9b4 100644
--- a/handlers/http_response_rule.go
+++ b/handlers/http_response_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/http_response_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateHTTPResponseRuleHandlerImpl implementation of the CreateHTTPResponseRuleHandler interface using client-native client
diff --git a/handlers/information.go b/handlers/information.go
index 96e51ae8..49b486e2 100644
--- a/handlers/information.go
+++ b/handlers/information.go
@@ -30,10 +30,10 @@ import (
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/strfmt"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/information"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //GetHaproxyProcessInfoHandlerImpl implementation of the GetHaproxyProcessInfoHandler interface using client-native client
diff --git a/handlers/log_target.go b/handlers/log_target.go
index ef711bf4..2a06bb15 100644
--- a/handlers/log_target.go
+++ b/handlers/log_target.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/log_target"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateLogTargetHandlerImpl implementation of the CreateLogTargetHandler interface using client-native client
diff --git a/handlers/map.go b/handlers/map.go
index 73d3c6ed..fe897d3e 100644
--- a/handlers/map.go
+++ b/handlers/map.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/maps"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //MapsCreateRuntimeMapHandlerImpl implementation of the MapsCreateRuntimeMapHandler interface using client-native client
diff --git a/handlers/nameserver.go b/handlers/nameserver.go
index cfa1df3f..67fd8d1c 100644
--- a/handlers/nameserver.go
+++ b/handlers/nameserver.go
@@ -2,11 +2,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/nameserver"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateNameserverHandlerImpl implementation of the CreateNameserverHandler interface using client-native client
diff --git a/handlers/peer.go b/handlers/peer.go
index 8f5fd1bc..2a4f14c7 100644
--- a/handlers/peer.go
+++ b/handlers/peer.go
@@ -2,11 +2,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/peer"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreatePeerHandlerImpl implementation of the CreatePeerHandler interface using client-native client
diff --git a/handlers/peer_entry.go b/handlers/peer_entry.go
index 733a439b..ad1cac02 100644
--- a/handlers/peer_entry.go
+++ b/handlers/peer_entry.go
@@ -2,11 +2,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/peer_entry"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreatePeerEntryHandlerImpl implementation of the CreatePeerEntryHandler interface using client-native client
diff --git a/handlers/raw.go b/handlers/raw.go
index ca8cb638..571d5811 100644
--- a/handlers/raw.go
+++ b/handlers/raw.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/go-openapi/runtime/middleware"
 
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/configuration"
diff --git a/handlers/reloads.go b/handlers/reloads.go
index 360ef737..05c61ca8 100644
--- a/handlers/reloads.go
+++ b/handlers/reloads.go
@@ -22,7 +22,7 @@ import (
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/reloads"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //GetReloadHandlerImpl implementation of the GetReloadHandler interface using client-native client
diff --git a/handlers/resolver.go b/handlers/resolver.go
index 59d7c1a5..222a7a50 100644
--- a/handlers/resolver.go
+++ b/handlers/resolver.go
@@ -2,11 +2,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/resolver"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateResolverHandlerImpl implementation of the CreateResolverHandler interface using client-native client
diff --git a/handlers/runtime.go b/handlers/runtime.go
index d9d12e3f..c4bf47c2 100644
--- a/handlers/runtime.go
+++ b/handlers/runtime.go
@@ -21,8 +21,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	client_native "github.com/haproxytech/client-native"
-	"github.com/haproxytech/models"
+	client_native "github.com/haproxytech/client-native/v2"
+	"github.com/haproxytech/models/v2"
 )
 
 //RuntimeSupportedFields is a map of fields supported through the runtime API for
diff --git a/handlers/runtime_server.go b/handlers/runtime_server.go
index 3fa2efbf..ea2756a1 100644
--- a/handlers/runtime_server.go
+++ b/handlers/runtime_server.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/server"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //GetRuntimeServerHandlerImpl implementation of the GetRuntimeServerHandler interface using client-native client
diff --git a/handlers/server.go b/handlers/server.go
index 289a336c..30c8bfbe 100644
--- a/handlers/server.go
+++ b/handlers/server.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/server"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateServerHandlerImpl implementation of the CreateServerHandler interface using client-native client
diff --git a/handlers/server_switching_rule.go b/handlers/server_switching_rule.go
index 5cd431c4..b1c8cc16 100644
--- a/handlers/server_switching_rule.go
+++ b/handlers/server_switching_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/server_switching_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateServerSwitchingRuleHandlerImpl implementation of the CreateServerSwitchingRuleHandler interface using client-native client
diff --git a/handlers/site.go b/handlers/site.go
index 7a6490a0..fb3da04d 100644
--- a/handlers/site.go
+++ b/handlers/site.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/sites"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateSiteHandlerImpl implementation of the CreateSiteHandler interface using client-native client
diff --git a/handlers/stats.go b/handlers/stats.go
index 1f11e0c7..230466fa 100644
--- a/handlers/stats.go
+++ b/handlers/stats.go
@@ -17,10 +17,10 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/stats"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //GetStatsHandlerImpl implementation of the GetStatsHandler interface using client-native client
diff --git a/handlers/stick_rule.go b/handlers/stick_rule.go
index d3811bc4..d46dfacf 100644
--- a/handlers/stick_rule.go
+++ b/handlers/stick_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/stick_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateStickRuleHandlerImpl implementation of the CreateStickRuleHandler interface using client-native client
diff --git a/handlers/stick_table.go b/handlers/stick_table.go
index 77f20671..a7f60d86 100644
--- a/handlers/stick_table.go
+++ b/handlers/stick_table.go
@@ -20,10 +20,10 @@ import (
 	"strings"
 
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/stick_table"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //GetStickTablesHandlerImpl implementation of the GetStickTablesHandler interface using client-native client
diff --git a/handlers/tcp_request_rule.go b/handlers/tcp_request_rule.go
index ace48bba..c1230589 100644
--- a/handlers/tcp_request_rule.go
+++ b/handlers/tcp_request_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/tcp_request_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateTCPRequestRuleHandlerImpl implementation of the CreateTCPRequestRuleHandler interface using client-native client
diff --git a/handlers/tcp_response_rule.go b/handlers/tcp_response_rule.go
index d0dd5b27..b13505a6 100644
--- a/handlers/tcp_response_rule.go
+++ b/handlers/tcp_response_rule.go
@@ -17,11 +17,11 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/tcp_response_rule"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 //CreateTCPResponseRuleHandlerImpl implementation of the CreateTCPResponseRuleHandler interface using client-native client
diff --git a/handlers/transaction.go b/handlers/transaction.go
index 0ffda986..a17f4995 100644
--- a/handlers/transaction.go
+++ b/handlers/transaction.go
@@ -17,7 +17,7 @@ package handlers
 
 import (
 	"github.com/go-openapi/runtime/middleware"
-	client_native "github.com/haproxytech/client-native"
+	client_native "github.com/haproxytech/client-native/v2"
 	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/dataplaneapi/misc"
 	"github.com/haproxytech/dataplaneapi/operations/transactions"
diff --git a/haproxy/reload_agent.go b/haproxy/reload_agent.go
index 32fc367b..0bbbfb0e 100644
--- a/haproxy/reload_agent.go
+++ b/haproxy/reload_agent.go
@@ -26,7 +26,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/misc/misc.go b/misc/misc.go
index fae9ddf5..277ec981 100644
--- a/misc/misc.go
+++ b/misc/misc.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/haproxytech/dataplaneapi/haproxy"
 
-	"github.com/haproxytech/client-native/configuration"
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/client-native/v2/configuration"
+	"github.com/haproxytech/models/v2"
 )
 
 const (
diff --git a/operations/acl/create_acl.go b/operations/acl/create_acl.go
index eed6d2f6..00bfca55 100644
--- a/operations/acl/create_acl.go
+++ b/operations/acl/create_acl.go
@@ -23,7 +23,7 @@ package acl
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateACLHandlerFunc turns a function with the right signature into a create Acl handler
diff --git a/operations/acl/create_acl_parameters.go b/operations/acl/create_acl_parameters.go
index 87cb67b6..01966502 100644
--- a/operations/acl/create_acl_parameters.go
+++ b/operations/acl/create_acl_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateACLParams creates a new CreateACLParams object
diff --git a/operations/acl/create_acl_responses.go b/operations/acl/create_acl_responses.go
index f3ebb1c0..346667ed 100644
--- a/operations/acl/create_acl_responses.go
+++ b/operations/acl/create_acl_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateACLCreatedCode is the HTTP code returned for type CreateACLCreated
diff --git a/operations/acl/create_acl_urlbuilder.go b/operations/acl/create_acl_urlbuilder.go
index acc1667f..c38c3cfa 100644
--- a/operations/acl/create_acl_urlbuilder.go
+++ b/operations/acl/create_acl_urlbuilder.go
@@ -70,38 +70,38 @@ func (o *CreateACLURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/acl/delete_acl.go b/operations/acl/delete_acl.go
index 6ad0f63e..229f6340 100644
--- a/operations/acl/delete_acl.go
+++ b/operations/acl/delete_acl.go
@@ -23,7 +23,7 @@ package acl
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteACLHandlerFunc turns a function with the right signature into a delete Acl handler
diff --git a/operations/acl/delete_acl_parameters.go b/operations/acl/delete_acl_parameters.go
index be041c81..66752a6d 100644
--- a/operations/acl/delete_acl_parameters.go
+++ b/operations/acl/delete_acl_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteACLParams creates a new DeleteACLParams object
diff --git a/operations/acl/delete_acl_responses.go b/operations/acl/delete_acl_responses.go
index 886ef5aa..bf098748 100644
--- a/operations/acl/delete_acl_responses.go
+++ b/operations/acl/delete_acl_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteACLAcceptedCode is the HTTP code returned for type DeleteACLAccepted
diff --git a/operations/acl/delete_acl_urlbuilder.go b/operations/acl/delete_acl_urlbuilder.go
index 023eb3f3..12cbaada 100644
--- a/operations/acl/delete_acl_urlbuilder.go
+++ b/operations/acl/delete_acl_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *DeleteACLURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/acl/get_acl.go b/operations/acl/get_acl.go
index e889e04b..4ec4b0f0 100644
--- a/operations/acl/get_acl.go
+++ b/operations/acl/get_acl.go
@@ -23,12 +23,12 @@ package acl
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetACLHandlerFunc turns a function with the right signature into a get Acl handler
@@ -93,6 +93,7 @@ func (o *GetACL) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetACLOKBody get ACL o k body
+//
 // swagger:model GetACLOKBody
 type GetACLOKBody struct {
 
diff --git a/operations/acl/get_acl_parameters.go b/operations/acl/get_acl_parameters.go
index d1d4e7e4..0892811f 100644
--- a/operations/acl/get_acl_parameters.go
+++ b/operations/acl/get_acl_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetACLParams creates a new GetACLParams object
diff --git a/operations/acl/get_acl_responses.go b/operations/acl/get_acl_responses.go
index 88b70177..f54f0321 100644
--- a/operations/acl/get_acl_responses.go
+++ b/operations/acl/get_acl_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetACLOKCode is the HTTP code returned for type GetACLOK
diff --git a/operations/acl/get_acl_urlbuilder.go b/operations/acl/get_acl_urlbuilder.go
index 36c42965..469603f6 100644
--- a/operations/acl/get_acl_urlbuilder.go
+++ b/operations/acl/get_acl_urlbuilder.go
@@ -78,22 +78,22 @@ func (o *GetACLURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/acl/get_acls.go b/operations/acl/get_acls.go
index 5ddf6ded..32ffc934 100644
--- a/operations/acl/get_acls.go
+++ b/operations/acl/get_acls.go
@@ -23,13 +23,13 @@ package acl
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetAclsHandlerFunc turns a function with the right signature into a get acls handler
@@ -94,6 +94,7 @@ func (o *GetAcls) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetAclsOKBody get acls o k body
+//
 // swagger:model GetAclsOKBody
 type GetAclsOKBody struct {
 
diff --git a/operations/acl/get_acls_parameters.go b/operations/acl/get_acls_parameters.go
index c01c03a7..d44eacc5 100644
--- a/operations/acl/get_acls_parameters.go
+++ b/operations/acl/get_acls_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetAclsParams creates a new GetAclsParams object
diff --git a/operations/acl/get_acls_responses.go b/operations/acl/get_acls_responses.go
index f8302380..931b92d6 100644
--- a/operations/acl/get_acls_responses.go
+++ b/operations/acl/get_acls_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetAclsOKCode is the HTTP code returned for type GetAclsOK
diff --git a/operations/acl/get_acls_urlbuilder.go b/operations/acl/get_acls_urlbuilder.go
index 6a5937ff..8a3ae2eb 100644
--- a/operations/acl/get_acls_urlbuilder.go
+++ b/operations/acl/get_acls_urlbuilder.go
@@ -66,22 +66,22 @@ func (o *GetAclsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/acl/replace_acl.go b/operations/acl/replace_acl.go
index 0705cd07..813a37cd 100644
--- a/operations/acl/replace_acl.go
+++ b/operations/acl/replace_acl.go
@@ -23,7 +23,7 @@ package acl
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceACLHandlerFunc turns a function with the right signature into a replace Acl handler
diff --git a/operations/acl/replace_acl_parameters.go b/operations/acl/replace_acl_parameters.go
index 0aaa21a0..72501c64 100644
--- a/operations/acl/replace_acl_parameters.go
+++ b/operations/acl/replace_acl_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceACLParams creates a new ReplaceACLParams object
diff --git a/operations/acl/replace_acl_responses.go b/operations/acl/replace_acl_responses.go
index 273374b5..d8dc73ca 100644
--- a/operations/acl/replace_acl_responses.go
+++ b/operations/acl/replace_acl_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceACLOKCode is the HTTP code returned for type ReplaceACLOK
diff --git a/operations/acl/replace_acl_urlbuilder.go b/operations/acl/replace_acl_urlbuilder.go
index 7a8059ba..cb1741f0 100644
--- a/operations/acl/replace_acl_urlbuilder.go
+++ b/operations/acl/replace_acl_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *ReplaceACLURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend/create_backend.go b/operations/backend/create_backend.go
index 54ed9384..3d8e0d23 100644
--- a/operations/backend/create_backend.go
+++ b/operations/backend/create_backend.go
@@ -23,7 +23,7 @@ package backend
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateBackendHandlerFunc turns a function with the right signature into a create backend handler
diff --git a/operations/backend/create_backend_parameters.go b/operations/backend/create_backend_parameters.go
index 337f9f38..c04d7275 100644
--- a/operations/backend/create_backend_parameters.go
+++ b/operations/backend/create_backend_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateBackendParams creates a new CreateBackendParams object
diff --git a/operations/backend/create_backend_responses.go b/operations/backend/create_backend_responses.go
index 4de980dd..e4c98bb0 100644
--- a/operations/backend/create_backend_responses.go
+++ b/operations/backend/create_backend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateBackendCreatedCode is the HTTP code returned for type CreateBackendCreated
diff --git a/operations/backend/create_backend_urlbuilder.go b/operations/backend/create_backend_urlbuilder.go
index addd98c5..0e0a9465 100644
--- a/operations/backend/create_backend_urlbuilder.go
+++ b/operations/backend/create_backend_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *CreateBackendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend/delete_backend.go b/operations/backend/delete_backend.go
index 89be4d45..4ac4251d 100644
--- a/operations/backend/delete_backend.go
+++ b/operations/backend/delete_backend.go
@@ -23,7 +23,7 @@ package backend
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteBackendHandlerFunc turns a function with the right signature into a delete backend handler
diff --git a/operations/backend/delete_backend_parameters.go b/operations/backend/delete_backend_parameters.go
index aa45a418..758febf2 100644
--- a/operations/backend/delete_backend_parameters.go
+++ b/operations/backend/delete_backend_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteBackendParams creates a new DeleteBackendParams object
diff --git a/operations/backend/delete_backend_responses.go b/operations/backend/delete_backend_responses.go
index b7714eaf..9c66cf67 100644
--- a/operations/backend/delete_backend_responses.go
+++ b/operations/backend/delete_backend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteBackendAcceptedCode is the HTTP code returned for type DeleteBackendAccepted
diff --git a/operations/backend/delete_backend_urlbuilder.go b/operations/backend/delete_backend_urlbuilder.go
index 27779f1d..fad8af0e 100644
--- a/operations/backend/delete_backend_urlbuilder.go
+++ b/operations/backend/delete_backend_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *DeleteBackendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend/get_backend.go b/operations/backend/get_backend.go
index 295fc0ba..6d826818 100644
--- a/operations/backend/get_backend.go
+++ b/operations/backend/get_backend.go
@@ -23,12 +23,12 @@ package backend
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendHandlerFunc turns a function with the right signature into a get backend handler
@@ -93,6 +93,7 @@ func (o *GetBackend) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetBackendOKBody get backend o k body
+//
 // swagger:model GetBackendOKBody
 type GetBackendOKBody struct {
 
diff --git a/operations/backend/get_backend_parameters.go b/operations/backend/get_backend_parameters.go
index 84fc2b1e..b5cb6e22 100644
--- a/operations/backend/get_backend_parameters.go
+++ b/operations/backend/get_backend_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetBackendParams creates a new GetBackendParams object
diff --git a/operations/backend/get_backend_responses.go b/operations/backend/get_backend_responses.go
index eeaa8c14..10d482f2 100644
--- a/operations/backend/get_backend_responses.go
+++ b/operations/backend/get_backend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendOKCode is the HTTP code returned for type GetBackendOK
diff --git a/operations/backend/get_backend_urlbuilder.go b/operations/backend/get_backend_urlbuilder.go
index 1237c17c..3c3ca79a 100644
--- a/operations/backend/get_backend_urlbuilder.go
+++ b/operations/backend/get_backend_urlbuilder.go
@@ -74,12 +74,12 @@ func (o *GetBackendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend/get_backends.go b/operations/backend/get_backends.go
index f38ac2d3..8fb3e042 100644
--- a/operations/backend/get_backends.go
+++ b/operations/backend/get_backends.go
@@ -23,13 +23,13 @@ package backend
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendsHandlerFunc turns a function with the right signature into a get backends handler
@@ -94,6 +94,7 @@ func (o *GetBackends) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetBackendsOKBody get backends o k body
+//
 // swagger:model GetBackendsOKBody
 type GetBackendsOKBody struct {
 
diff --git a/operations/backend/get_backends_parameters.go b/operations/backend/get_backends_parameters.go
index 4077edb1..0de4bfdd 100644
--- a/operations/backend/get_backends_parameters.go
+++ b/operations/backend/get_backends_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetBackendsParams creates a new GetBackendsParams object
diff --git a/operations/backend/get_backends_responses.go b/operations/backend/get_backends_responses.go
index 31716727..96bbed7a 100644
--- a/operations/backend/get_backends_responses.go
+++ b/operations/backend/get_backends_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendsOKCode is the HTTP code returned for type GetBackendsOK
diff --git a/operations/backend/get_backends_urlbuilder.go b/operations/backend/get_backends_urlbuilder.go
index f868f49a..244ab1a6 100644
--- a/operations/backend/get_backends_urlbuilder.go
+++ b/operations/backend/get_backends_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetBackendsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend/replace_backend.go b/operations/backend/replace_backend.go
index c5cf34e3..41ed8807 100644
--- a/operations/backend/replace_backend.go
+++ b/operations/backend/replace_backend.go
@@ -23,7 +23,7 @@ package backend
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceBackendHandlerFunc turns a function with the right signature into a replace backend handler
diff --git a/operations/backend/replace_backend_parameters.go b/operations/backend/replace_backend_parameters.go
index c362cc9d..c58b77d1 100644
--- a/operations/backend/replace_backend_parameters.go
+++ b/operations/backend/replace_backend_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceBackendParams creates a new ReplaceBackendParams object
diff --git a/operations/backend/replace_backend_responses.go b/operations/backend/replace_backend_responses.go
index b5b17965..5d9da081 100644
--- a/operations/backend/replace_backend_responses.go
+++ b/operations/backend/replace_backend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceBackendOKCode is the HTTP code returned for type ReplaceBackendOK
diff --git a/operations/backend/replace_backend_urlbuilder.go b/operations/backend/replace_backend_urlbuilder.go
index 77c845d0..ef3c7aaa 100644
--- a/operations/backend/replace_backend_urlbuilder.go
+++ b/operations/backend/replace_backend_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *ReplaceBackendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend_switching_rule/create_backend_switching_rule.go b/operations/backend_switching_rule/create_backend_switching_rule.go
index e123fd01..418144ca 100644
--- a/operations/backend_switching_rule/create_backend_switching_rule.go
+++ b/operations/backend_switching_rule/create_backend_switching_rule.go
@@ -23,7 +23,7 @@ package backend_switching_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateBackendSwitchingRuleHandlerFunc turns a function with the right signature into a create backend switching rule handler
diff --git a/operations/backend_switching_rule/create_backend_switching_rule_parameters.go b/operations/backend_switching_rule/create_backend_switching_rule_parameters.go
index f5633f63..939e9eec 100644
--- a/operations/backend_switching_rule/create_backend_switching_rule_parameters.go
+++ b/operations/backend_switching_rule/create_backend_switching_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateBackendSwitchingRuleParams creates a new CreateBackendSwitchingRuleParams object
diff --git a/operations/backend_switching_rule/create_backend_switching_rule_responses.go b/operations/backend_switching_rule/create_backend_switching_rule_responses.go
index 9fea68c9..9e2c5a53 100644
--- a/operations/backend_switching_rule/create_backend_switching_rule_responses.go
+++ b/operations/backend_switching_rule/create_backend_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateBackendSwitchingRuleCreatedCode is the HTTP code returned for type CreateBackendSwitchingRuleCreated
diff --git a/operations/backend_switching_rule/create_backend_switching_rule_urlbuilder.go b/operations/backend_switching_rule/create_backend_switching_rule_urlbuilder.go
index 9aca14c4..52b22ec8 100644
--- a/operations/backend_switching_rule/create_backend_switching_rule_urlbuilder.go
+++ b/operations/backend_switching_rule/create_backend_switching_rule_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateBackendSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend_switching_rule/delete_backend_switching_rule.go b/operations/backend_switching_rule/delete_backend_switching_rule.go
index bba679b7..60519795 100644
--- a/operations/backend_switching_rule/delete_backend_switching_rule.go
+++ b/operations/backend_switching_rule/delete_backend_switching_rule.go
@@ -23,7 +23,7 @@ package backend_switching_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteBackendSwitchingRuleHandlerFunc turns a function with the right signature into a delete backend switching rule handler
diff --git a/operations/backend_switching_rule/delete_backend_switching_rule_parameters.go b/operations/backend_switching_rule/delete_backend_switching_rule_parameters.go
index 299b5975..f763fac2 100644
--- a/operations/backend_switching_rule/delete_backend_switching_rule_parameters.go
+++ b/operations/backend_switching_rule/delete_backend_switching_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteBackendSwitchingRuleParams creates a new DeleteBackendSwitchingRuleParams object
diff --git a/operations/backend_switching_rule/delete_backend_switching_rule_responses.go b/operations/backend_switching_rule/delete_backend_switching_rule_responses.go
index 02c1dcb4..903167a8 100644
--- a/operations/backend_switching_rule/delete_backend_switching_rule_responses.go
+++ b/operations/backend_switching_rule/delete_backend_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteBackendSwitchingRuleAcceptedCode is the HTTP code returned for type DeleteBackendSwitchingRuleAccepted
diff --git a/operations/backend_switching_rule/delete_backend_switching_rule_urlbuilder.go b/operations/backend_switching_rule/delete_backend_switching_rule_urlbuilder.go
index b46ec442..a519fb37 100644
--- a/operations/backend_switching_rule/delete_backend_switching_rule_urlbuilder.go
+++ b/operations/backend_switching_rule/delete_backend_switching_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteBackendSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend_switching_rule/get_backend_switching_rule.go b/operations/backend_switching_rule/get_backend_switching_rule.go
index 3cbacc5b..71c8a2c3 100644
--- a/operations/backend_switching_rule/get_backend_switching_rule.go
+++ b/operations/backend_switching_rule/get_backend_switching_rule.go
@@ -23,12 +23,12 @@ package backend_switching_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendSwitchingRuleHandlerFunc turns a function with the right signature into a get backend switching rule handler
@@ -93,6 +93,7 @@ func (o *GetBackendSwitchingRule) ServeHTTP(rw http.ResponseWriter, r *http.Requ
 }
 
 // GetBackendSwitchingRuleOKBody get backend switching rule o k body
+//
 // swagger:model GetBackendSwitchingRuleOKBody
 type GetBackendSwitchingRuleOKBody struct {
 
diff --git a/operations/backend_switching_rule/get_backend_switching_rule_parameters.go b/operations/backend_switching_rule/get_backend_switching_rule_parameters.go
index 86fa45c0..46de803b 100644
--- a/operations/backend_switching_rule/get_backend_switching_rule_parameters.go
+++ b/operations/backend_switching_rule/get_backend_switching_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetBackendSwitchingRuleParams creates a new GetBackendSwitchingRuleParams object
diff --git a/operations/backend_switching_rule/get_backend_switching_rule_responses.go b/operations/backend_switching_rule/get_backend_switching_rule_responses.go
index fd734b09..94f09068 100644
--- a/operations/backend_switching_rule/get_backend_switching_rule_responses.go
+++ b/operations/backend_switching_rule/get_backend_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendSwitchingRuleOKCode is the HTTP code returned for type GetBackendSwitchingRuleOK
diff --git a/operations/backend_switching_rule/get_backend_switching_rule_urlbuilder.go b/operations/backend_switching_rule/get_backend_switching_rule_urlbuilder.go
index ccbd08ab..35974d4f 100644
--- a/operations/backend_switching_rule/get_backend_switching_rule_urlbuilder.go
+++ b/operations/backend_switching_rule/get_backend_switching_rule_urlbuilder.go
@@ -77,17 +77,17 @@ func (o *GetBackendSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend_switching_rule/get_backend_switching_rules.go b/operations/backend_switching_rule/get_backend_switching_rules.go
index f3336de0..b27c9b7a 100644
--- a/operations/backend_switching_rule/get_backend_switching_rules.go
+++ b/operations/backend_switching_rule/get_backend_switching_rules.go
@@ -23,13 +23,13 @@ package backend_switching_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendSwitchingRulesHandlerFunc turns a function with the right signature into a get backend switching rules handler
@@ -94,6 +94,7 @@ func (o *GetBackendSwitchingRules) ServeHTTP(rw http.ResponseWriter, r *http.Req
 }
 
 // GetBackendSwitchingRulesOKBody get backend switching rules o k body
+//
 // swagger:model GetBackendSwitchingRulesOKBody
 type GetBackendSwitchingRulesOKBody struct {
 
diff --git a/operations/backend_switching_rule/get_backend_switching_rules_parameters.go b/operations/backend_switching_rule/get_backend_switching_rules_parameters.go
index be75cbbc..1af57e7f 100644
--- a/operations/backend_switching_rule/get_backend_switching_rules_parameters.go
+++ b/operations/backend_switching_rule/get_backend_switching_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetBackendSwitchingRulesParams creates a new GetBackendSwitchingRulesParams object
diff --git a/operations/backend_switching_rule/get_backend_switching_rules_responses.go b/operations/backend_switching_rule/get_backend_switching_rules_responses.go
index 6f69c9a0..89ad8685 100644
--- a/operations/backend_switching_rule/get_backend_switching_rules_responses.go
+++ b/operations/backend_switching_rule/get_backend_switching_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBackendSwitchingRulesOKCode is the HTTP code returned for type GetBackendSwitchingRulesOK
diff --git a/operations/backend_switching_rule/get_backend_switching_rules_urlbuilder.go b/operations/backend_switching_rule/get_backend_switching_rules_urlbuilder.go
index 2f6afc1b..53faae2b 100644
--- a/operations/backend_switching_rule/get_backend_switching_rules_urlbuilder.go
+++ b/operations/backend_switching_rule/get_backend_switching_rules_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetBackendSwitchingRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/backend_switching_rule/replace_backend_switching_rule.go b/operations/backend_switching_rule/replace_backend_switching_rule.go
index 8e64987d..24b4d924 100644
--- a/operations/backend_switching_rule/replace_backend_switching_rule.go
+++ b/operations/backend_switching_rule/replace_backend_switching_rule.go
@@ -23,7 +23,7 @@ package backend_switching_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceBackendSwitchingRuleHandlerFunc turns a function with the right signature into a replace backend switching rule handler
diff --git a/operations/backend_switching_rule/replace_backend_switching_rule_parameters.go b/operations/backend_switching_rule/replace_backend_switching_rule_parameters.go
index 232bf02d..7fcc7d21 100644
--- a/operations/backend_switching_rule/replace_backend_switching_rule_parameters.go
+++ b/operations/backend_switching_rule/replace_backend_switching_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceBackendSwitchingRuleParams creates a new ReplaceBackendSwitchingRuleParams object
diff --git a/operations/backend_switching_rule/replace_backend_switching_rule_responses.go b/operations/backend_switching_rule/replace_backend_switching_rule_responses.go
index f3428bc8..eb262693 100644
--- a/operations/backend_switching_rule/replace_backend_switching_rule_responses.go
+++ b/operations/backend_switching_rule/replace_backend_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceBackendSwitchingRuleOKCode is the HTTP code returned for type ReplaceBackendSwitchingRuleOK
diff --git a/operations/backend_switching_rule/replace_backend_switching_rule_urlbuilder.go b/operations/backend_switching_rule/replace_backend_switching_rule_urlbuilder.go
index 764ab973..9aae5b01 100644
--- a/operations/backend_switching_rule/replace_backend_switching_rule_urlbuilder.go
+++ b/operations/backend_switching_rule/replace_backend_switching_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceBackendSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/bind/create_bind.go b/operations/bind/create_bind.go
index 61b9c221..2b4b5a39 100644
--- a/operations/bind/create_bind.go
+++ b/operations/bind/create_bind.go
@@ -23,7 +23,7 @@ package bind
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateBindHandlerFunc turns a function with the right signature into a create bind handler
diff --git a/operations/bind/create_bind_parameters.go b/operations/bind/create_bind_parameters.go
index fa80f065..f7849e50 100644
--- a/operations/bind/create_bind_parameters.go
+++ b/operations/bind/create_bind_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateBindParams creates a new CreateBindParams object
diff --git a/operations/bind/create_bind_responses.go b/operations/bind/create_bind_responses.go
index bde2eef3..230abc21 100644
--- a/operations/bind/create_bind_responses.go
+++ b/operations/bind/create_bind_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateBindCreatedCode is the HTTP code returned for type CreateBindCreated
diff --git a/operations/bind/create_bind_urlbuilder.go b/operations/bind/create_bind_urlbuilder.go
index cfe7008e..4492d3d2 100644
--- a/operations/bind/create_bind_urlbuilder.go
+++ b/operations/bind/create_bind_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateBindURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/bind/delete_bind.go b/operations/bind/delete_bind.go
index 89d1f929..965b85e4 100644
--- a/operations/bind/delete_bind.go
+++ b/operations/bind/delete_bind.go
@@ -23,7 +23,7 @@ package bind
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteBindHandlerFunc turns a function with the right signature into a delete bind handler
diff --git a/operations/bind/delete_bind_parameters.go b/operations/bind/delete_bind_parameters.go
index 05819140..7a6b723d 100644
--- a/operations/bind/delete_bind_parameters.go
+++ b/operations/bind/delete_bind_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteBindParams creates a new DeleteBindParams object
diff --git a/operations/bind/delete_bind_responses.go b/operations/bind/delete_bind_responses.go
index 0934e89e..eb6b700a 100644
--- a/operations/bind/delete_bind_responses.go
+++ b/operations/bind/delete_bind_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteBindAcceptedCode is the HTTP code returned for type DeleteBindAccepted
diff --git a/operations/bind/delete_bind_urlbuilder.go b/operations/bind/delete_bind_urlbuilder.go
index b171c81b..46fcc8be 100644
--- a/operations/bind/delete_bind_urlbuilder.go
+++ b/operations/bind/delete_bind_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteBindURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/bind/get_bind.go b/operations/bind/get_bind.go
index 15f505ef..5d7184d3 100644
--- a/operations/bind/get_bind.go
+++ b/operations/bind/get_bind.go
@@ -23,12 +23,12 @@ package bind
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBindHandlerFunc turns a function with the right signature into a get bind handler
@@ -93,6 +93,7 @@ func (o *GetBind) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetBindOKBody get bind o k body
+//
 // swagger:model GetBindOKBody
 type GetBindOKBody struct {
 
diff --git a/operations/bind/get_bind_parameters.go b/operations/bind/get_bind_parameters.go
index c293dff0..b10d69df 100644
--- a/operations/bind/get_bind_parameters.go
+++ b/operations/bind/get_bind_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetBindParams creates a new GetBindParams object
diff --git a/operations/bind/get_bind_responses.go b/operations/bind/get_bind_responses.go
index 2b8dfe77..cf08a589 100644
--- a/operations/bind/get_bind_responses.go
+++ b/operations/bind/get_bind_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBindOKCode is the HTTP code returned for type GetBindOK
diff --git a/operations/bind/get_bind_urlbuilder.go b/operations/bind/get_bind_urlbuilder.go
index 61d9bb2c..955f67d1 100644
--- a/operations/bind/get_bind_urlbuilder.go
+++ b/operations/bind/get_bind_urlbuilder.go
@@ -75,17 +75,17 @@ func (o *GetBindURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/bind/get_binds.go b/operations/bind/get_binds.go
index d1778fa9..4cf6f9ed 100644
--- a/operations/bind/get_binds.go
+++ b/operations/bind/get_binds.go
@@ -23,13 +23,13 @@ package bind
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBindsHandlerFunc turns a function with the right signature into a get binds handler
@@ -94,6 +94,7 @@ func (o *GetBinds) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetBindsOKBody get binds o k body
+//
 // swagger:model GetBindsOKBody
 type GetBindsOKBody struct {
 
diff --git a/operations/bind/get_binds_parameters.go b/operations/bind/get_binds_parameters.go
index e822e0ac..39d0174a 100644
--- a/operations/bind/get_binds_parameters.go
+++ b/operations/bind/get_binds_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetBindsParams creates a new GetBindsParams object
diff --git a/operations/bind/get_binds_responses.go b/operations/bind/get_binds_responses.go
index 7bd5d78d..c5dde081 100644
--- a/operations/bind/get_binds_responses.go
+++ b/operations/bind/get_binds_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetBindsOKCode is the HTTP code returned for type GetBindsOK
diff --git a/operations/bind/get_binds_urlbuilder.go b/operations/bind/get_binds_urlbuilder.go
index 9fac1e55..77a4abad 100644
--- a/operations/bind/get_binds_urlbuilder.go
+++ b/operations/bind/get_binds_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetBindsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/bind/replace_bind.go b/operations/bind/replace_bind.go
index e3ff702d..299f1cb5 100644
--- a/operations/bind/replace_bind.go
+++ b/operations/bind/replace_bind.go
@@ -23,7 +23,7 @@ package bind
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceBindHandlerFunc turns a function with the right signature into a replace bind handler
diff --git a/operations/bind/replace_bind_parameters.go b/operations/bind/replace_bind_parameters.go
index fdc466b6..e62958f3 100644
--- a/operations/bind/replace_bind_parameters.go
+++ b/operations/bind/replace_bind_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceBindParams creates a new ReplaceBindParams object
diff --git a/operations/bind/replace_bind_responses.go b/operations/bind/replace_bind_responses.go
index 6805b7dc..5aaa37f4 100644
--- a/operations/bind/replace_bind_responses.go
+++ b/operations/bind/replace_bind_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceBindOKCode is the HTTP code returned for type ReplaceBindOK
diff --git a/operations/bind/replace_bind_urlbuilder.go b/operations/bind/replace_bind_urlbuilder.go
index 4b8a8aeb..3cce126f 100644
--- a/operations/bind/replace_bind_urlbuilder.go
+++ b/operations/bind/replace_bind_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceBindURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	frontend := o.Frontend
-	if frontend != "" {
-		qs.Set("frontend", frontend)
+	frontendQ := o.Frontend
+	if frontendQ != "" {
+		qs.Set("frontend", frontendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/cluster/initiate_certificate_refresh.go b/operations/cluster/initiate_certificate_refresh.go
index 638fc754..300fabaf 100644
--- a/operations/cluster/initiate_certificate_refresh.go
+++ b/operations/cluster/initiate_certificate_refresh.go
@@ -23,7 +23,7 @@ package cluster
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // InitiateCertificateRefreshHandlerFunc turns a function with the right signature into a initiate certificate refresh handler
diff --git a/operations/cluster/initiate_certificate_refresh_responses.go b/operations/cluster/initiate_certificate_refresh_responses.go
index fd46b5af..6a15f6c7 100644
--- a/operations/cluster/initiate_certificate_refresh_responses.go
+++ b/operations/cluster/initiate_certificate_refresh_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // InitiateCertificateRefreshOKCode is the HTTP code returned for type InitiateCertificateRefreshOK
diff --git a/operations/cluster/post_cluster.go b/operations/cluster/post_cluster.go
index c0a81280..48502ace 100644
--- a/operations/cluster/post_cluster.go
+++ b/operations/cluster/post_cluster.go
@@ -23,7 +23,7 @@ package cluster
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // PostClusterHandlerFunc turns a function with the right signature into a post cluster handler
diff --git a/operations/cluster/post_cluster_parameters.go b/operations/cluster/post_cluster_parameters.go
index 1a02016f..15178af8 100644
--- a/operations/cluster/post_cluster_parameters.go
+++ b/operations/cluster/post_cluster_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewPostClusterParams creates a new PostClusterParams object
diff --git a/operations/cluster/post_cluster_responses.go b/operations/cluster/post_cluster_responses.go
index c3eb8040..700aacc9 100644
--- a/operations/cluster/post_cluster_responses.go
+++ b/operations/cluster/post_cluster_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // PostClusterOKCode is the HTTP code returned for type PostClusterOK
diff --git a/operations/cluster/post_cluster_urlbuilder.go b/operations/cluster/post_cluster_urlbuilder.go
index ae5ce9a6..5d8a6d1e 100644
--- a/operations/cluster/post_cluster_urlbuilder.go
+++ b/operations/cluster/post_cluster_urlbuilder.go
@@ -66,12 +66,12 @@ func (o *PostClusterURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/configuration/get_h_a_proxy_configuration.go b/operations/configuration/get_h_a_proxy_configuration.go
index 5a7393a5..d220be17 100644
--- a/operations/configuration/get_h_a_proxy_configuration.go
+++ b/operations/configuration/get_h_a_proxy_configuration.go
@@ -23,11 +23,11 @@ package configuration
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 )
 
 // GetHAProxyConfigurationHandlerFunc turns a function with the right signature into a get h a proxy configuration handler
@@ -92,6 +92,7 @@ func (o *GetHAProxyConfiguration) ServeHTTP(rw http.ResponseWriter, r *http.Requ
 }
 
 // GetHAProxyConfigurationOKBody get h a proxy configuration o k body
+//
 // swagger:model GetHAProxyConfigurationOKBody
 type GetHAProxyConfigurationOKBody struct {
 
diff --git a/operations/configuration/get_h_a_proxy_configuration_parameters.go b/operations/configuration/get_h_a_proxy_configuration_parameters.go
index 15a38c9c..94e42a18 100644
--- a/operations/configuration/get_h_a_proxy_configuration_parameters.go
+++ b/operations/configuration/get_h_a_proxy_configuration_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetHAProxyConfigurationParams creates a new GetHAProxyConfigurationParams object
diff --git a/operations/configuration/get_h_a_proxy_configuration_responses.go b/operations/configuration/get_h_a_proxy_configuration_responses.go
index a8db2018..1f496bcc 100644
--- a/operations/configuration/get_h_a_proxy_configuration_responses.go
+++ b/operations/configuration/get_h_a_proxy_configuration_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHAProxyConfigurationOKCode is the HTTP code returned for type GetHAProxyConfigurationOK
diff --git a/operations/configuration/get_h_a_proxy_configuration_urlbuilder.go b/operations/configuration/get_h_a_proxy_configuration_urlbuilder.go
index 94f54e35..e74b31d3 100644
--- a/operations/configuration/get_h_a_proxy_configuration_urlbuilder.go
+++ b/operations/configuration/get_h_a_proxy_configuration_urlbuilder.go
@@ -67,20 +67,20 @@ func (o *GetHAProxyConfigurationURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/configuration/post_h_a_proxy_configuration.go b/operations/configuration/post_h_a_proxy_configuration.go
index 7debd0a2..daac4989 100644
--- a/operations/configuration/post_h_a_proxy_configuration.go
+++ b/operations/configuration/post_h_a_proxy_configuration.go
@@ -23,7 +23,7 @@ package configuration
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // PostHAProxyConfigurationHandlerFunc turns a function with the right signature into a post h a proxy configuration handler
diff --git a/operations/configuration/post_h_a_proxy_configuration_parameters.go b/operations/configuration/post_h_a_proxy_configuration_parameters.go
index 3f770dc3..0229fd34 100644
--- a/operations/configuration/post_h_a_proxy_configuration_parameters.go
+++ b/operations/configuration/post_h_a_proxy_configuration_parameters.go
@@ -27,9 +27,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewPostHAProxyConfigurationParams creates a new PostHAProxyConfigurationParams object
diff --git a/operations/configuration/post_h_a_proxy_configuration_responses.go b/operations/configuration/post_h_a_proxy_configuration_responses.go
index e51e8eb2..b2c210b5 100644
--- a/operations/configuration/post_h_a_proxy_configuration_responses.go
+++ b/operations/configuration/post_h_a_proxy_configuration_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // PostHAProxyConfigurationCreatedCode is the HTTP code returned for type PostHAProxyConfigurationCreated
diff --git a/operations/configuration/post_h_a_proxy_configuration_urlbuilder.go b/operations/configuration/post_h_a_proxy_configuration_urlbuilder.go
index 35792c2a..693ee880 100644
--- a/operations/configuration/post_h_a_proxy_configuration_urlbuilder.go
+++ b/operations/configuration/post_h_a_proxy_configuration_urlbuilder.go
@@ -69,36 +69,36 @@ func (o *PostHAProxyConfigurationURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var skipReload string
+	var skipReloadQ string
 	if o.SkipReload != nil {
-		skipReload = swag.FormatBool(*o.SkipReload)
+		skipReloadQ = swag.FormatBool(*o.SkipReload)
 	}
-	if skipReload != "" {
-		qs.Set("skip_reload", skipReload)
+	if skipReloadQ != "" {
+		qs.Set("skip_reload", skipReloadQ)
 	}
 
-	var skipVersion string
+	var skipVersionQ string
 	if o.SkipVersion != nil {
-		skipVersion = swag.FormatBool(*o.SkipVersion)
+		skipVersionQ = swag.FormatBool(*o.SkipVersion)
 	}
-	if skipVersion != "" {
-		qs.Set("skip_version", skipVersion)
+	if skipVersionQ != "" {
+		qs.Set("skip_version", skipVersionQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/data_plane_api.go b/operations/data_plane_api.go
index 9a604e74..dc9ab498 100644
--- a/operations/data_plane_api.go
+++ b/operations/data_plane_api.go
@@ -25,13 +25,13 @@ import (
 	"net/http"
 	"strings"
 
-	errors "github.com/go-openapi/errors"
-	loads "github.com/go-openapi/loads"
-	runtime "github.com/go-openapi/runtime"
-	middleware "github.com/go-openapi/runtime/middleware"
-	security "github.com/go-openapi/runtime/security"
-	spec "github.com/go-openapi/spec"
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/loads"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/security"
+	"github.com/go-openapi/spec"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
 	"github.com/haproxytech/dataplaneapi/operations/acl"
@@ -70,433 +70,436 @@ import (
 // NewDataPlaneAPI creates a new DataPlane instance
 func NewDataPlaneAPI(spec *loads.Document) *DataPlaneAPI {
 	return &DataPlaneAPI{
-		handlers:              make(map[string]map[string]http.Handler),
-		formats:               strfmt.Default,
-		defaultConsumes:       "application/json",
-		defaultProduces:       "application/json",
-		customConsumers:       make(map[string]runtime.Consumer),
-		customProducers:       make(map[string]runtime.Producer),
-		ServerShutdown:        func() {},
-		spec:                  spec,
-		ServeError:            errors.ServeError,
-		BasicAuthenticator:    security.BasicAuth,
-		APIKeyAuthenticator:   security.APIKeyAuth,
-		BearerAuthenticator:   security.BearerAuth,
+		handlers:            make(map[string]map[string]http.Handler),
+		formats:             strfmt.Default,
+		defaultConsumes:     "application/json",
+		defaultProduces:     "application/json",
+		customConsumers:     make(map[string]runtime.Consumer),
+		customProducers:     make(map[string]runtime.Producer),
+		PreServerShutdown:   func() {},
+		ServerShutdown:      func() {},
+		spec:                spec,
+		ServeError:          errors.ServeError,
+		BasicAuthenticator:  security.BasicAuth,
+		APIKeyAuthenticator: security.APIKeyAuth,
+		BearerAuthenticator: security.BearerAuth,
+
 		JSONConsumer:          runtime.JSONConsumer(),
 		MultipartformConsumer: runtime.DiscardConsumer,
 		TxtConsumer:           runtime.TextConsumer(),
-		JSONProducer:          runtime.JSONProducer(),
+
+		JSONProducer: runtime.JSONProducer(),
+
 		MapsAddMapEntryHandler: maps.AddMapEntryHandlerFunc(func(params maps.AddMapEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsAddMapEntry has not yet been implemented")
+			return middleware.NotImplemented("operation maps.AddMapEntry has not yet been implemented")
 		}),
 		MapsClearRuntimeMapHandler: maps.ClearRuntimeMapHandlerFunc(func(params maps.ClearRuntimeMapParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsClearRuntimeMap has not yet been implemented")
+			return middleware.NotImplemented("operation maps.ClearRuntimeMap has not yet been implemented")
 		}),
 		TransactionsCommitTransactionHandler: transactions.CommitTransactionHandlerFunc(func(params transactions.CommitTransactionParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TransactionsCommitTransaction has not yet been implemented")
+			return middleware.NotImplemented("operation transactions.CommitTransaction has not yet been implemented")
 		}),
 		ACLCreateACLHandler: acl.CreateACLHandlerFunc(func(params acl.CreateACLParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ACLCreateACL has not yet been implemented")
+			return middleware.NotImplemented("operation acl.CreateACL has not yet been implemented")
 		}),
 		BackendCreateBackendHandler: backend.CreateBackendHandlerFunc(func(params backend.CreateBackendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendCreateBackend has not yet been implemented")
+			return middleware.NotImplemented("operation backend.CreateBackend has not yet been implemented")
 		}),
 		BackendSwitchingRuleCreateBackendSwitchingRuleHandler: backend_switching_rule.CreateBackendSwitchingRuleHandlerFunc(func(params backend_switching_rule.CreateBackendSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendSwitchingRuleCreateBackendSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation backend_switching_rule.CreateBackendSwitchingRule has not yet been implemented")
 		}),
 		BindCreateBindHandler: bind.CreateBindHandlerFunc(func(params bind.CreateBindParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BindCreateBind has not yet been implemented")
+			return middleware.NotImplemented("operation bind.CreateBind has not yet been implemented")
 		}),
 		FilterCreateFilterHandler: filter.CreateFilterHandlerFunc(func(params filter.CreateFilterParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FilterCreateFilter has not yet been implemented")
+			return middleware.NotImplemented("operation filter.CreateFilter has not yet been implemented")
 		}),
 		FrontendCreateFrontendHandler: frontend.CreateFrontendHandlerFunc(func(params frontend.CreateFrontendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FrontendCreateFrontend has not yet been implemented")
+			return middleware.NotImplemented("operation frontend.CreateFrontend has not yet been implemented")
 		}),
 		HTTPRequestRuleCreateHTTPRequestRuleHandler: http_request_rule.CreateHTTPRequestRuleHandlerFunc(func(params http_request_rule.CreateHTTPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPRequestRuleCreateHTTPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_request_rule.CreateHTTPRequestRule has not yet been implemented")
 		}),
 		HTTPResponseRuleCreateHTTPResponseRuleHandler: http_response_rule.CreateHTTPResponseRuleHandlerFunc(func(params http_response_rule.CreateHTTPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPResponseRuleCreateHTTPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_response_rule.CreateHTTPResponseRule has not yet been implemented")
 		}),
 		LogTargetCreateLogTargetHandler: log_target.CreateLogTargetHandlerFunc(func(params log_target.CreateLogTargetParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation LogTargetCreateLogTarget has not yet been implemented")
+			return middleware.NotImplemented("operation log_target.CreateLogTarget has not yet been implemented")
 		}),
 		NameserverCreateNameserverHandler: nameserver.CreateNameserverHandlerFunc(func(params nameserver.CreateNameserverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation NameserverCreateNameserver has not yet been implemented")
+			return middleware.NotImplemented("operation nameserver.CreateNameserver has not yet been implemented")
 		}),
 		PeerCreatePeerHandler: peer.CreatePeerHandlerFunc(func(params peer.CreatePeerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerCreatePeer has not yet been implemented")
+			return middleware.NotImplemented("operation peer.CreatePeer has not yet been implemented")
 		}),
 		PeerEntryCreatePeerEntryHandler: peer_entry.CreatePeerEntryHandlerFunc(func(params peer_entry.CreatePeerEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerEntryCreatePeerEntry has not yet been implemented")
+			return middleware.NotImplemented("operation peer_entry.CreatePeerEntry has not yet been implemented")
 		}),
 		ResolverCreateResolverHandler: resolver.CreateResolverHandlerFunc(func(params resolver.CreateResolverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ResolverCreateResolver has not yet been implemented")
+			return middleware.NotImplemented("operation resolver.CreateResolver has not yet been implemented")
 		}),
 		MapsCreateRuntimeMapHandler: maps.CreateRuntimeMapHandlerFunc(func(params maps.CreateRuntimeMapParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsCreateRuntimeMap has not yet been implemented")
+			return middleware.NotImplemented("operation maps.CreateRuntimeMap has not yet been implemented")
 		}),
 		ServerCreateServerHandler: server.CreateServerHandlerFunc(func(params server.CreateServerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerCreateServer has not yet been implemented")
+			return middleware.NotImplemented("operation server.CreateServer has not yet been implemented")
 		}),
 		ServerSwitchingRuleCreateServerSwitchingRuleHandler: server_switching_rule.CreateServerSwitchingRuleHandlerFunc(func(params server_switching_rule.CreateServerSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerSwitchingRuleCreateServerSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation server_switching_rule.CreateServerSwitchingRule has not yet been implemented")
 		}),
 		SitesCreateSiteHandler: sites.CreateSiteHandlerFunc(func(params sites.CreateSiteParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation SitesCreateSite has not yet been implemented")
+			return middleware.NotImplemented("operation sites.CreateSite has not yet been implemented")
 		}),
 		StickRuleCreateStickRuleHandler: stick_rule.CreateStickRuleHandlerFunc(func(params stick_rule.CreateStickRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickRuleCreateStickRule has not yet been implemented")
+			return middleware.NotImplemented("operation stick_rule.CreateStickRule has not yet been implemented")
 		}),
 		TCPRequestRuleCreateTCPRequestRuleHandler: tcp_request_rule.CreateTCPRequestRuleHandlerFunc(func(params tcp_request_rule.CreateTCPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPRequestRuleCreateTCPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_request_rule.CreateTCPRequestRule has not yet been implemented")
 		}),
 		TCPResponseRuleCreateTCPResponseRuleHandler: tcp_response_rule.CreateTCPResponseRuleHandlerFunc(func(params tcp_response_rule.CreateTCPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPResponseRuleCreateTCPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_response_rule.CreateTCPResponseRule has not yet been implemented")
 		}),
 		ACLDeleteACLHandler: acl.DeleteACLHandlerFunc(func(params acl.DeleteACLParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ACLDeleteACL has not yet been implemented")
+			return middleware.NotImplemented("operation acl.DeleteACL has not yet been implemented")
 		}),
 		BackendDeleteBackendHandler: backend.DeleteBackendHandlerFunc(func(params backend.DeleteBackendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendDeleteBackend has not yet been implemented")
+			return middleware.NotImplemented("operation backend.DeleteBackend has not yet been implemented")
 		}),
 		BackendSwitchingRuleDeleteBackendSwitchingRuleHandler: backend_switching_rule.DeleteBackendSwitchingRuleHandlerFunc(func(params backend_switching_rule.DeleteBackendSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendSwitchingRuleDeleteBackendSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation backend_switching_rule.DeleteBackendSwitchingRule has not yet been implemented")
 		}),
 		BindDeleteBindHandler: bind.DeleteBindHandlerFunc(func(params bind.DeleteBindParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BindDeleteBind has not yet been implemented")
+			return middleware.NotImplemented("operation bind.DeleteBind has not yet been implemented")
 		}),
 		FilterDeleteFilterHandler: filter.DeleteFilterHandlerFunc(func(params filter.DeleteFilterParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FilterDeleteFilter has not yet been implemented")
+			return middleware.NotImplemented("operation filter.DeleteFilter has not yet been implemented")
 		}),
 		FrontendDeleteFrontendHandler: frontend.DeleteFrontendHandlerFunc(func(params frontend.DeleteFrontendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FrontendDeleteFrontend has not yet been implemented")
+			return middleware.NotImplemented("operation frontend.DeleteFrontend has not yet been implemented")
 		}),
 		HTTPRequestRuleDeleteHTTPRequestRuleHandler: http_request_rule.DeleteHTTPRequestRuleHandlerFunc(func(params http_request_rule.DeleteHTTPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPRequestRuleDeleteHTTPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_request_rule.DeleteHTTPRequestRule has not yet been implemented")
 		}),
 		HTTPResponseRuleDeleteHTTPResponseRuleHandler: http_response_rule.DeleteHTTPResponseRuleHandlerFunc(func(params http_response_rule.DeleteHTTPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPResponseRuleDeleteHTTPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_response_rule.DeleteHTTPResponseRule has not yet been implemented")
 		}),
 		LogTargetDeleteLogTargetHandler: log_target.DeleteLogTargetHandlerFunc(func(params log_target.DeleteLogTargetParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation LogTargetDeleteLogTarget has not yet been implemented")
+			return middleware.NotImplemented("operation log_target.DeleteLogTarget has not yet been implemented")
 		}),
 		NameserverDeleteNameserverHandler: nameserver.DeleteNameserverHandlerFunc(func(params nameserver.DeleteNameserverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation NameserverDeleteNameserver has not yet been implemented")
+			return middleware.NotImplemented("operation nameserver.DeleteNameserver has not yet been implemented")
 		}),
 		PeerDeletePeerHandler: peer.DeletePeerHandlerFunc(func(params peer.DeletePeerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerDeletePeer has not yet been implemented")
+			return middleware.NotImplemented("operation peer.DeletePeer has not yet been implemented")
 		}),
 		PeerEntryDeletePeerEntryHandler: peer_entry.DeletePeerEntryHandlerFunc(func(params peer_entry.DeletePeerEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerEntryDeletePeerEntry has not yet been implemented")
+			return middleware.NotImplemented("operation peer_entry.DeletePeerEntry has not yet been implemented")
 		}),
 		ResolverDeleteResolverHandler: resolver.DeleteResolverHandlerFunc(func(params resolver.DeleteResolverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ResolverDeleteResolver has not yet been implemented")
+			return middleware.NotImplemented("operation resolver.DeleteResolver has not yet been implemented")
 		}),
 		MapsDeleteRuntimeMapEntryHandler: maps.DeleteRuntimeMapEntryHandlerFunc(func(params maps.DeleteRuntimeMapEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsDeleteRuntimeMapEntry has not yet been implemented")
+			return middleware.NotImplemented("operation maps.DeleteRuntimeMapEntry has not yet been implemented")
 		}),
 		ServerDeleteServerHandler: server.DeleteServerHandlerFunc(func(params server.DeleteServerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerDeleteServer has not yet been implemented")
+			return middleware.NotImplemented("operation server.DeleteServer has not yet been implemented")
 		}),
 		ServerSwitchingRuleDeleteServerSwitchingRuleHandler: server_switching_rule.DeleteServerSwitchingRuleHandlerFunc(func(params server_switching_rule.DeleteServerSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerSwitchingRuleDeleteServerSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation server_switching_rule.DeleteServerSwitchingRule has not yet been implemented")
 		}),
 		SitesDeleteSiteHandler: sites.DeleteSiteHandlerFunc(func(params sites.DeleteSiteParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation SitesDeleteSite has not yet been implemented")
+			return middleware.NotImplemented("operation sites.DeleteSite has not yet been implemented")
 		}),
 		StickRuleDeleteStickRuleHandler: stick_rule.DeleteStickRuleHandlerFunc(func(params stick_rule.DeleteStickRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickRuleDeleteStickRule has not yet been implemented")
+			return middleware.NotImplemented("operation stick_rule.DeleteStickRule has not yet been implemented")
 		}),
 		TCPRequestRuleDeleteTCPRequestRuleHandler: tcp_request_rule.DeleteTCPRequestRuleHandlerFunc(func(params tcp_request_rule.DeleteTCPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPRequestRuleDeleteTCPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_request_rule.DeleteTCPRequestRule has not yet been implemented")
 		}),
 		TCPResponseRuleDeleteTCPResponseRuleHandler: tcp_response_rule.DeleteTCPResponseRuleHandlerFunc(func(params tcp_response_rule.DeleteTCPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPResponseRuleDeleteTCPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_response_rule.DeleteTCPResponseRule has not yet been implemented")
 		}),
 		TransactionsDeleteTransactionHandler: transactions.DeleteTransactionHandlerFunc(func(params transactions.DeleteTransactionParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TransactionsDeleteTransaction has not yet been implemented")
+			return middleware.NotImplemented("operation transactions.DeleteTransaction has not yet been implemented")
 		}),
 		DiscoveryGetAPIEndpointsHandler: discovery.GetAPIEndpointsHandlerFunc(func(params discovery.GetAPIEndpointsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetAPIEndpoints has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetAPIEndpoints has not yet been implemented")
 		}),
 		ACLGetACLHandler: acl.GetACLHandlerFunc(func(params acl.GetACLParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ACLGetACL has not yet been implemented")
+			return middleware.NotImplemented("operation acl.GetACL has not yet been implemented")
 		}),
 		ACLGetAclsHandler: acl.GetAclsHandlerFunc(func(params acl.GetAclsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ACLGetAcls has not yet been implemented")
+			return middleware.NotImplemented("operation acl.GetAcls has not yet been implemented")
 		}),
 		MapsGetAllRuntimeMapFilesHandler: maps.GetAllRuntimeMapFilesHandlerFunc(func(params maps.GetAllRuntimeMapFilesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsGetAllRuntimeMapFiles has not yet been implemented")
+			return middleware.NotImplemented("operation maps.GetAllRuntimeMapFiles has not yet been implemented")
 		}),
 		BackendGetBackendHandler: backend.GetBackendHandlerFunc(func(params backend.GetBackendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendGetBackend has not yet been implemented")
+			return middleware.NotImplemented("operation backend.GetBackend has not yet been implemented")
 		}),
 		BackendSwitchingRuleGetBackendSwitchingRuleHandler: backend_switching_rule.GetBackendSwitchingRuleHandlerFunc(func(params backend_switching_rule.GetBackendSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendSwitchingRuleGetBackendSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation backend_switching_rule.GetBackendSwitchingRule has not yet been implemented")
 		}),
 		BackendSwitchingRuleGetBackendSwitchingRulesHandler: backend_switching_rule.GetBackendSwitchingRulesHandlerFunc(func(params backend_switching_rule.GetBackendSwitchingRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendSwitchingRuleGetBackendSwitchingRules has not yet been implemented")
+			return middleware.NotImplemented("operation backend_switching_rule.GetBackendSwitchingRules has not yet been implemented")
 		}),
 		BackendGetBackendsHandler: backend.GetBackendsHandlerFunc(func(params backend.GetBackendsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendGetBackends has not yet been implemented")
+			return middleware.NotImplemented("operation backend.GetBackends has not yet been implemented")
 		}),
 		BindGetBindHandler: bind.GetBindHandlerFunc(func(params bind.GetBindParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BindGetBind has not yet been implemented")
+			return middleware.NotImplemented("operation bind.GetBind has not yet been implemented")
 		}),
 		BindGetBindsHandler: bind.GetBindsHandlerFunc(func(params bind.GetBindsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BindGetBinds has not yet been implemented")
+			return middleware.NotImplemented("operation bind.GetBinds has not yet been implemented")
 		}),
 		DiscoveryGetClusterHandler: discovery.GetClusterHandlerFunc(func(params discovery.GetClusterParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetCluster has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetCluster has not yet been implemented")
 		}),
 		DiscoveryGetConfigurationEndpointsHandler: discovery.GetConfigurationEndpointsHandlerFunc(func(params discovery.GetConfigurationEndpointsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetConfigurationEndpoints has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetConfigurationEndpoints has not yet been implemented")
 		}),
 		DefaultsGetDefaultsHandler: defaults.GetDefaultsHandlerFunc(func(params defaults.GetDefaultsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DefaultsGetDefaults has not yet been implemented")
+			return middleware.NotImplemented("operation defaults.GetDefaults has not yet been implemented")
 		}),
 		FilterGetFilterHandler: filter.GetFilterHandlerFunc(func(params filter.GetFilterParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FilterGetFilter has not yet been implemented")
+			return middleware.NotImplemented("operation filter.GetFilter has not yet been implemented")
 		}),
 		FilterGetFiltersHandler: filter.GetFiltersHandlerFunc(func(params filter.GetFiltersParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FilterGetFilters has not yet been implemented")
+			return middleware.NotImplemented("operation filter.GetFilters has not yet been implemented")
 		}),
 		FrontendGetFrontendHandler: frontend.GetFrontendHandlerFunc(func(params frontend.GetFrontendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FrontendGetFrontend has not yet been implemented")
+			return middleware.NotImplemented("operation frontend.GetFrontend has not yet been implemented")
 		}),
 		FrontendGetFrontendsHandler: frontend.GetFrontendsHandlerFunc(func(params frontend.GetFrontendsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FrontendGetFrontends has not yet been implemented")
+			return middleware.NotImplemented("operation frontend.GetFrontends has not yet been implemented")
 		}),
 		GlobalGetGlobalHandler: global.GetGlobalHandlerFunc(func(params global.GetGlobalParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation GlobalGetGlobal has not yet been implemented")
+			return middleware.NotImplemented("operation global.GetGlobal has not yet been implemented")
 		}),
 		ConfigurationGetHAProxyConfigurationHandler: configuration.GetHAProxyConfigurationHandlerFunc(func(params configuration.GetHAProxyConfigurationParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ConfigurationGetHAProxyConfiguration has not yet been implemented")
+			return middleware.NotImplemented("operation configuration.GetHAProxyConfiguration has not yet been implemented")
 		}),
 		HTTPRequestRuleGetHTTPRequestRuleHandler: http_request_rule.GetHTTPRequestRuleHandlerFunc(func(params http_request_rule.GetHTTPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPRequestRuleGetHTTPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_request_rule.GetHTTPRequestRule has not yet been implemented")
 		}),
 		HTTPRequestRuleGetHTTPRequestRulesHandler: http_request_rule.GetHTTPRequestRulesHandlerFunc(func(params http_request_rule.GetHTTPRequestRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPRequestRuleGetHTTPRequestRules has not yet been implemented")
+			return middleware.NotImplemented("operation http_request_rule.GetHTTPRequestRules has not yet been implemented")
 		}),
 		HTTPResponseRuleGetHTTPResponseRuleHandler: http_response_rule.GetHTTPResponseRuleHandlerFunc(func(params http_response_rule.GetHTTPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPResponseRuleGetHTTPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_response_rule.GetHTTPResponseRule has not yet been implemented")
 		}),
 		HTTPResponseRuleGetHTTPResponseRulesHandler: http_response_rule.GetHTTPResponseRulesHandlerFunc(func(params http_response_rule.GetHTTPResponseRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPResponseRuleGetHTTPResponseRules has not yet been implemented")
+			return middleware.NotImplemented("operation http_response_rule.GetHTTPResponseRules has not yet been implemented")
 		}),
 		DiscoveryGetHaproxyEndpointsHandler: discovery.GetHaproxyEndpointsHandlerFunc(func(params discovery.GetHaproxyEndpointsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetHaproxyEndpoints has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetHaproxyEndpoints has not yet been implemented")
 		}),
 		InformationGetHaproxyProcessInfoHandler: information.GetHaproxyProcessInfoHandlerFunc(func(params information.GetHaproxyProcessInfoParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation InformationGetHaproxyProcessInfo has not yet been implemented")
+			return middleware.NotImplemented("operation information.GetHaproxyProcessInfo has not yet been implemented")
 		}),
 		InformationGetInfoHandler: information.GetInfoHandlerFunc(func(params information.GetInfoParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation InformationGetInfo has not yet been implemented")
+			return middleware.NotImplemented("operation information.GetInfo has not yet been implemented")
 		}),
 		LogTargetGetLogTargetHandler: log_target.GetLogTargetHandlerFunc(func(params log_target.GetLogTargetParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation LogTargetGetLogTarget has not yet been implemented")
+			return middleware.NotImplemented("operation log_target.GetLogTarget has not yet been implemented")
 		}),
 		LogTargetGetLogTargetsHandler: log_target.GetLogTargetsHandlerFunc(func(params log_target.GetLogTargetsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation LogTargetGetLogTargets has not yet been implemented")
+			return middleware.NotImplemented("operation log_target.GetLogTargets has not yet been implemented")
 		}),
 		NameserverGetNameserverHandler: nameserver.GetNameserverHandlerFunc(func(params nameserver.GetNameserverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation NameserverGetNameserver has not yet been implemented")
+			return middleware.NotImplemented("operation nameserver.GetNameserver has not yet been implemented")
 		}),
 		NameserverGetNameserversHandler: nameserver.GetNameserversHandlerFunc(func(params nameserver.GetNameserversParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation NameserverGetNameservers has not yet been implemented")
+			return middleware.NotImplemented("operation nameserver.GetNameservers has not yet been implemented")
 		}),
 		MapsGetOneRuntimeMapHandler: maps.GetOneRuntimeMapHandlerFunc(func(params maps.GetOneRuntimeMapParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsGetOneRuntimeMap has not yet been implemented")
+			return middleware.NotImplemented("operation maps.GetOneRuntimeMap has not yet been implemented")
 		}),
 		PeerEntryGetPeerEntriesHandler: peer_entry.GetPeerEntriesHandlerFunc(func(params peer_entry.GetPeerEntriesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerEntryGetPeerEntries has not yet been implemented")
+			return middleware.NotImplemented("operation peer_entry.GetPeerEntries has not yet been implemented")
 		}),
 		PeerEntryGetPeerEntryHandler: peer_entry.GetPeerEntryHandlerFunc(func(params peer_entry.GetPeerEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerEntryGetPeerEntry has not yet been implemented")
+			return middleware.NotImplemented("operation peer_entry.GetPeerEntry has not yet been implemented")
 		}),
 		PeerGetPeerSectionHandler: peer.GetPeerSectionHandlerFunc(func(params peer.GetPeerSectionParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerGetPeerSection has not yet been implemented")
+			return middleware.NotImplemented("operation peer.GetPeerSection has not yet been implemented")
 		}),
 		PeerGetPeerSectionsHandler: peer.GetPeerSectionsHandlerFunc(func(params peer.GetPeerSectionsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerGetPeerSections has not yet been implemented")
+			return middleware.NotImplemented("operation peer.GetPeerSections has not yet been implemented")
 		}),
 		ReloadsGetReloadHandler: reloads.GetReloadHandlerFunc(func(params reloads.GetReloadParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ReloadsGetReload has not yet been implemented")
+			return middleware.NotImplemented("operation reloads.GetReload has not yet been implemented")
 		}),
 		ReloadsGetReloadsHandler: reloads.GetReloadsHandlerFunc(func(params reloads.GetReloadsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ReloadsGetReloads has not yet been implemented")
+			return middleware.NotImplemented("operation reloads.GetReloads has not yet been implemented")
 		}),
 		ResolverGetResolverHandler: resolver.GetResolverHandlerFunc(func(params resolver.GetResolverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ResolverGetResolver has not yet been implemented")
+			return middleware.NotImplemented("operation resolver.GetResolver has not yet been implemented")
 		}),
 		ResolverGetResolversHandler: resolver.GetResolversHandlerFunc(func(params resolver.GetResolversParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ResolverGetResolvers has not yet been implemented")
+			return middleware.NotImplemented("operation resolver.GetResolvers has not yet been implemented")
 		}),
 		DiscoveryGetRuntimeEndpointsHandler: discovery.GetRuntimeEndpointsHandlerFunc(func(params discovery.GetRuntimeEndpointsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetRuntimeEndpoints has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetRuntimeEndpoints has not yet been implemented")
 		}),
 		MapsGetRuntimeMapEntryHandler: maps.GetRuntimeMapEntryHandlerFunc(func(params maps.GetRuntimeMapEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsGetRuntimeMapEntry has not yet been implemented")
+			return middleware.NotImplemented("operation maps.GetRuntimeMapEntry has not yet been implemented")
 		}),
 		ServerGetRuntimeServerHandler: server.GetRuntimeServerHandlerFunc(func(params server.GetRuntimeServerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerGetRuntimeServer has not yet been implemented")
+			return middleware.NotImplemented("operation server.GetRuntimeServer has not yet been implemented")
 		}),
 		ServerGetRuntimeServersHandler: server.GetRuntimeServersHandlerFunc(func(params server.GetRuntimeServersParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerGetRuntimeServers has not yet been implemented")
+			return middleware.NotImplemented("operation server.GetRuntimeServers has not yet been implemented")
 		}),
 		ServerGetServerHandler: server.GetServerHandlerFunc(func(params server.GetServerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerGetServer has not yet been implemented")
+			return middleware.NotImplemented("operation server.GetServer has not yet been implemented")
 		}),
 		ServerSwitchingRuleGetServerSwitchingRuleHandler: server_switching_rule.GetServerSwitchingRuleHandlerFunc(func(params server_switching_rule.GetServerSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerSwitchingRuleGetServerSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation server_switching_rule.GetServerSwitchingRule has not yet been implemented")
 		}),
 		ServerSwitchingRuleGetServerSwitchingRulesHandler: server_switching_rule.GetServerSwitchingRulesHandlerFunc(func(params server_switching_rule.GetServerSwitchingRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerSwitchingRuleGetServerSwitchingRules has not yet been implemented")
+			return middleware.NotImplemented("operation server_switching_rule.GetServerSwitchingRules has not yet been implemented")
 		}),
 		ServerGetServersHandler: server.GetServersHandlerFunc(func(params server.GetServersParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerGetServers has not yet been implemented")
+			return middleware.NotImplemented("operation server.GetServers has not yet been implemented")
 		}),
 		DiscoveryGetServicesEndpointsHandler: discovery.GetServicesEndpointsHandlerFunc(func(params discovery.GetServicesEndpointsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetServicesEndpoints has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetServicesEndpoints has not yet been implemented")
 		}),
 		SitesGetSiteHandler: sites.GetSiteHandlerFunc(func(params sites.GetSiteParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation SitesGetSite has not yet been implemented")
+			return middleware.NotImplemented("operation sites.GetSite has not yet been implemented")
 		}),
 		SitesGetSitesHandler: sites.GetSitesHandlerFunc(func(params sites.GetSitesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation SitesGetSites has not yet been implemented")
+			return middleware.NotImplemented("operation sites.GetSites has not yet been implemented")
 		}),
 		SpecificationGetSpecificationHandler: specification.GetSpecificationHandlerFunc(func(params specification.GetSpecificationParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation SpecificationGetSpecification has not yet been implemented")
+			return middleware.NotImplemented("operation specification.GetSpecification has not yet been implemented")
 		}),
 		StatsGetStatsHandler: stats.GetStatsHandlerFunc(func(params stats.GetStatsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StatsGetStats has not yet been implemented")
+			return middleware.NotImplemented("operation stats.GetStats has not yet been implemented")
 		}),
 		DiscoveryGetStatsEndpointsHandler: discovery.GetStatsEndpointsHandlerFunc(func(params discovery.GetStatsEndpointsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DiscoveryGetStatsEndpoints has not yet been implemented")
+			return middleware.NotImplemented("operation discovery.GetStatsEndpoints has not yet been implemented")
 		}),
 		StickRuleGetStickRuleHandler: stick_rule.GetStickRuleHandlerFunc(func(params stick_rule.GetStickRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickRuleGetStickRule has not yet been implemented")
+			return middleware.NotImplemented("operation stick_rule.GetStickRule has not yet been implemented")
 		}),
 		StickRuleGetStickRulesHandler: stick_rule.GetStickRulesHandlerFunc(func(params stick_rule.GetStickRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickRuleGetStickRules has not yet been implemented")
+			return middleware.NotImplemented("operation stick_rule.GetStickRules has not yet been implemented")
 		}),
 		StickTableGetStickTableHandler: stick_table.GetStickTableHandlerFunc(func(params stick_table.GetStickTableParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickTableGetStickTable has not yet been implemented")
+			return middleware.NotImplemented("operation stick_table.GetStickTable has not yet been implemented")
 		}),
 		StickTableGetStickTableEntriesHandler: stick_table.GetStickTableEntriesHandlerFunc(func(params stick_table.GetStickTableEntriesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickTableGetStickTableEntries has not yet been implemented")
+			return middleware.NotImplemented("operation stick_table.GetStickTableEntries has not yet been implemented")
 		}),
 		StickTableGetStickTablesHandler: stick_table.GetStickTablesHandlerFunc(func(params stick_table.GetStickTablesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickTableGetStickTables has not yet been implemented")
+			return middleware.NotImplemented("operation stick_table.GetStickTables has not yet been implemented")
 		}),
 		TCPRequestRuleGetTCPRequestRuleHandler: tcp_request_rule.GetTCPRequestRuleHandlerFunc(func(params tcp_request_rule.GetTCPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPRequestRuleGetTCPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_request_rule.GetTCPRequestRule has not yet been implemented")
 		}),
 		TCPRequestRuleGetTCPRequestRulesHandler: tcp_request_rule.GetTCPRequestRulesHandlerFunc(func(params tcp_request_rule.GetTCPRequestRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPRequestRuleGetTCPRequestRules has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_request_rule.GetTCPRequestRules has not yet been implemented")
 		}),
 		TCPResponseRuleGetTCPResponseRuleHandler: tcp_response_rule.GetTCPResponseRuleHandlerFunc(func(params tcp_response_rule.GetTCPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPResponseRuleGetTCPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_response_rule.GetTCPResponseRule has not yet been implemented")
 		}),
 		TCPResponseRuleGetTCPResponseRulesHandler: tcp_response_rule.GetTCPResponseRulesHandlerFunc(func(params tcp_response_rule.GetTCPResponseRulesParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPResponseRuleGetTCPResponseRules has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_response_rule.GetTCPResponseRules has not yet been implemented")
 		}),
 		TransactionsGetTransactionHandler: transactions.GetTransactionHandlerFunc(func(params transactions.GetTransactionParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TransactionsGetTransaction has not yet been implemented")
+			return middleware.NotImplemented("operation transactions.GetTransaction has not yet been implemented")
 		}),
 		TransactionsGetTransactionsHandler: transactions.GetTransactionsHandlerFunc(func(params transactions.GetTransactionsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TransactionsGetTransactions has not yet been implemented")
+			return middleware.NotImplemented("operation transactions.GetTransactions has not yet been implemented")
 		}),
 		ClusterInitiateCertificateRefreshHandler: cluster.InitiateCertificateRefreshHandlerFunc(func(params cluster.InitiateCertificateRefreshParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ClusterInitiateCertificateRefresh has not yet been implemented")
+			return middleware.NotImplemented("operation cluster.InitiateCertificateRefresh has not yet been implemented")
 		}),
 		ClusterPostClusterHandler: cluster.PostClusterHandlerFunc(func(params cluster.PostClusterParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ClusterPostCluster has not yet been implemented")
+			return middleware.NotImplemented("operation cluster.PostCluster has not yet been implemented")
 		}),
 		ConfigurationPostHAProxyConfigurationHandler: configuration.PostHAProxyConfigurationHandlerFunc(func(params configuration.PostHAProxyConfigurationParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ConfigurationPostHAProxyConfiguration has not yet been implemented")
+			return middleware.NotImplemented("operation configuration.PostHAProxyConfiguration has not yet been implemented")
 		}),
 		ACLReplaceACLHandler: acl.ReplaceACLHandlerFunc(func(params acl.ReplaceACLParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ACLReplaceACL has not yet been implemented")
+			return middleware.NotImplemented("operation acl.ReplaceACL has not yet been implemented")
 		}),
 		BackendReplaceBackendHandler: backend.ReplaceBackendHandlerFunc(func(params backend.ReplaceBackendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendReplaceBackend has not yet been implemented")
+			return middleware.NotImplemented("operation backend.ReplaceBackend has not yet been implemented")
 		}),
 		BackendSwitchingRuleReplaceBackendSwitchingRuleHandler: backend_switching_rule.ReplaceBackendSwitchingRuleHandlerFunc(func(params backend_switching_rule.ReplaceBackendSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BackendSwitchingRuleReplaceBackendSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation backend_switching_rule.ReplaceBackendSwitchingRule has not yet been implemented")
 		}),
 		BindReplaceBindHandler: bind.ReplaceBindHandlerFunc(func(params bind.ReplaceBindParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation BindReplaceBind has not yet been implemented")
+			return middleware.NotImplemented("operation bind.ReplaceBind has not yet been implemented")
 		}),
 		DefaultsReplaceDefaultsHandler: defaults.ReplaceDefaultsHandlerFunc(func(params defaults.ReplaceDefaultsParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation DefaultsReplaceDefaults has not yet been implemented")
+			return middleware.NotImplemented("operation defaults.ReplaceDefaults has not yet been implemented")
 		}),
 		FilterReplaceFilterHandler: filter.ReplaceFilterHandlerFunc(func(params filter.ReplaceFilterParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FilterReplaceFilter has not yet been implemented")
+			return middleware.NotImplemented("operation filter.ReplaceFilter has not yet been implemented")
 		}),
 		FrontendReplaceFrontendHandler: frontend.ReplaceFrontendHandlerFunc(func(params frontend.ReplaceFrontendParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation FrontendReplaceFrontend has not yet been implemented")
+			return middleware.NotImplemented("operation frontend.ReplaceFrontend has not yet been implemented")
 		}),
 		GlobalReplaceGlobalHandler: global.ReplaceGlobalHandlerFunc(func(params global.ReplaceGlobalParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation GlobalReplaceGlobal has not yet been implemented")
+			return middleware.NotImplemented("operation global.ReplaceGlobal has not yet been implemented")
 		}),
 		HTTPRequestRuleReplaceHTTPRequestRuleHandler: http_request_rule.ReplaceHTTPRequestRuleHandlerFunc(func(params http_request_rule.ReplaceHTTPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPRequestRuleReplaceHTTPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_request_rule.ReplaceHTTPRequestRule has not yet been implemented")
 		}),
 		HTTPResponseRuleReplaceHTTPResponseRuleHandler: http_response_rule.ReplaceHTTPResponseRuleHandlerFunc(func(params http_response_rule.ReplaceHTTPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation HTTPResponseRuleReplaceHTTPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation http_response_rule.ReplaceHTTPResponseRule has not yet been implemented")
 		}),
 		LogTargetReplaceLogTargetHandler: log_target.ReplaceLogTargetHandlerFunc(func(params log_target.ReplaceLogTargetParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation LogTargetReplaceLogTarget has not yet been implemented")
+			return middleware.NotImplemented("operation log_target.ReplaceLogTarget has not yet been implemented")
 		}),
 		NameserverReplaceNameserverHandler: nameserver.ReplaceNameserverHandlerFunc(func(params nameserver.ReplaceNameserverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation NameserverReplaceNameserver has not yet been implemented")
+			return middleware.NotImplemented("operation nameserver.ReplaceNameserver has not yet been implemented")
 		}),
 		PeerEntryReplacePeerEntryHandler: peer_entry.ReplacePeerEntryHandlerFunc(func(params peer_entry.ReplacePeerEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation PeerEntryReplacePeerEntry has not yet been implemented")
+			return middleware.NotImplemented("operation peer_entry.ReplacePeerEntry has not yet been implemented")
 		}),
 		ResolverReplaceResolverHandler: resolver.ReplaceResolverHandlerFunc(func(params resolver.ReplaceResolverParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ResolverReplaceResolver has not yet been implemented")
+			return middleware.NotImplemented("operation resolver.ReplaceResolver has not yet been implemented")
 		}),
 		MapsReplaceRuntimeMapEntryHandler: maps.ReplaceRuntimeMapEntryHandlerFunc(func(params maps.ReplaceRuntimeMapEntryParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsReplaceRuntimeMapEntry has not yet been implemented")
+			return middleware.NotImplemented("operation maps.ReplaceRuntimeMapEntry has not yet been implemented")
 		}),
 		ServerReplaceRuntimeServerHandler: server.ReplaceRuntimeServerHandlerFunc(func(params server.ReplaceRuntimeServerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerReplaceRuntimeServer has not yet been implemented")
+			return middleware.NotImplemented("operation server.ReplaceRuntimeServer has not yet been implemented")
 		}),
 		ServerReplaceServerHandler: server.ReplaceServerHandlerFunc(func(params server.ReplaceServerParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerReplaceServer has not yet been implemented")
+			return middleware.NotImplemented("operation server.ReplaceServer has not yet been implemented")
 		}),
 		ServerSwitchingRuleReplaceServerSwitchingRuleHandler: server_switching_rule.ReplaceServerSwitchingRuleHandlerFunc(func(params server_switching_rule.ReplaceServerSwitchingRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation ServerSwitchingRuleReplaceServerSwitchingRule has not yet been implemented")
+			return middleware.NotImplemented("operation server_switching_rule.ReplaceServerSwitchingRule has not yet been implemented")
 		}),
 		SitesReplaceSiteHandler: sites.ReplaceSiteHandlerFunc(func(params sites.ReplaceSiteParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation SitesReplaceSite has not yet been implemented")
+			return middleware.NotImplemented("operation sites.ReplaceSite has not yet been implemented")
 		}),
 		StickRuleReplaceStickRuleHandler: stick_rule.ReplaceStickRuleHandlerFunc(func(params stick_rule.ReplaceStickRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation StickRuleReplaceStickRule has not yet been implemented")
+			return middleware.NotImplemented("operation stick_rule.ReplaceStickRule has not yet been implemented")
 		}),
 		TCPRequestRuleReplaceTCPRequestRuleHandler: tcp_request_rule.ReplaceTCPRequestRuleHandlerFunc(func(params tcp_request_rule.ReplaceTCPRequestRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPRequestRuleReplaceTCPRequestRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_request_rule.ReplaceTCPRequestRule has not yet been implemented")
 		}),
 		TCPResponseRuleReplaceTCPResponseRuleHandler: tcp_response_rule.ReplaceTCPResponseRuleHandlerFunc(func(params tcp_response_rule.ReplaceTCPResponseRuleParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TCPResponseRuleReplaceTCPResponseRule has not yet been implemented")
+			return middleware.NotImplemented("operation tcp_response_rule.ReplaceTCPResponseRule has not yet been implemented")
 		}),
 		MapsShowRuntimeMapHandler: maps.ShowRuntimeMapHandlerFunc(func(params maps.ShowRuntimeMapParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation MapsShowRuntimeMap has not yet been implemented")
+			return middleware.NotImplemented("operation maps.ShowRuntimeMap has not yet been implemented")
 		}),
 		TransactionsStartTransactionHandler: transactions.StartTransactionHandlerFunc(func(params transactions.StartTransactionParams, principal interface{}) middleware.Responder {
-			return middleware.NotImplemented("operation TransactionsStartTransaction has not yet been implemented")
+			return middleware.NotImplemented("operation transactions.StartTransaction has not yet been implemented")
 		}),
 
 		// Applies when the Authorization header is set with the Basic scheme
 		BasicAuthAuth: func(user string, pass string) (interface{}, error) {
 			return nil, errors.NotImplemented("basic auth  (basic_auth) has not yet been implemented")
 		},
-
 		// default authorizer is authorized meaning no requests are blocked
 		APIAuthorizer: security.Authorized(),
 	}
@@ -526,14 +529,18 @@ type DataPlaneAPI struct {
 	// It has a default implementation in the security package, however you can replace it for your particular usage.
 	BearerAuthenticator func(string, security.ScopedTokenAuthentication) runtime.Authenticator
 
-	// JSONConsumer registers a consumer for a "application/json" mime type
+	// JSONConsumer registers a consumer for the following mime types:
+	//   - application/json
 	JSONConsumer runtime.Consumer
-	// MultipartformConsumer registers a consumer for a "multipart/form-data" mime type
+	// MultipartformConsumer registers a consumer for the following mime types:
+	//   - multipart/form-data
 	MultipartformConsumer runtime.Consumer
-	// TxtConsumer registers a consumer for a "text/plain" mime type
+	// TxtConsumer registers a consumer for the following mime types:
+	//   - text/plain
 	TxtConsumer runtime.Consumer
 
-	// JSONProducer registers a producer for a "application/json" mime type
+	// JSONProducer registers a producer for the following mime types:
+	//   - application/json
 	JSONProducer runtime.Producer
 
 	// BasicAuthAuth registers a function that takes username and password and returns a principal
@@ -813,11 +820,14 @@ type DataPlaneAPI struct {
 	MapsShowRuntimeMapHandler maps.ShowRuntimeMapHandler
 	// TransactionsStartTransactionHandler sets the operation handler for the start transaction operation
 	TransactionsStartTransactionHandler transactions.StartTransactionHandler
-
 	// ServeError is called when an error is received, there is a default handler
 	// but you can set your own with this
 	ServeError func(http.ResponseWriter, *http.Request, error)
 
+	// PreServerShutdown is called before the HTTP(S) server is shutdown
+	// This allows for custom functions to get executed before the HTTP(S) server stops accepting traffic
+	PreServerShutdown func()
+
 	// ServerShutdown is called when the HTTP(S) server is shut down and done
 	// handling all active connections and does not accept connections any more
 	ServerShutdown func()
@@ -871,11 +881,9 @@ func (o *DataPlaneAPI) Validate() error {
 	if o.JSONConsumer == nil {
 		unregistered = append(unregistered, "JSONConsumer")
 	}
-
 	if o.MultipartformConsumer == nil {
 		unregistered = append(unregistered, "MultipartformConsumer")
 	}
-
 	if o.TxtConsumer == nil {
 		unregistered = append(unregistered, "TxtConsumer")
 	}
@@ -891,539 +899,405 @@ func (o *DataPlaneAPI) Validate() error {
 	if o.MapsAddMapEntryHandler == nil {
 		unregistered = append(unregistered, "maps.AddMapEntryHandler")
 	}
-
 	if o.MapsClearRuntimeMapHandler == nil {
 		unregistered = append(unregistered, "maps.ClearRuntimeMapHandler")
 	}
-
 	if o.TransactionsCommitTransactionHandler == nil {
 		unregistered = append(unregistered, "transactions.CommitTransactionHandler")
 	}
-
 	if o.ACLCreateACLHandler == nil {
 		unregistered = append(unregistered, "acl.CreateACLHandler")
 	}
-
 	if o.BackendCreateBackendHandler == nil {
 		unregistered = append(unregistered, "backend.CreateBackendHandler")
 	}
-
 	if o.BackendSwitchingRuleCreateBackendSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "backend_switching_rule.CreateBackendSwitchingRuleHandler")
 	}
-
 	if o.BindCreateBindHandler == nil {
 		unregistered = append(unregistered, "bind.CreateBindHandler")
 	}
-
 	if o.FilterCreateFilterHandler == nil {
 		unregistered = append(unregistered, "filter.CreateFilterHandler")
 	}
-
 	if o.FrontendCreateFrontendHandler == nil {
 		unregistered = append(unregistered, "frontend.CreateFrontendHandler")
 	}
-
 	if o.HTTPRequestRuleCreateHTTPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "http_request_rule.CreateHTTPRequestRuleHandler")
 	}
-
 	if o.HTTPResponseRuleCreateHTTPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "http_response_rule.CreateHTTPResponseRuleHandler")
 	}
-
 	if o.LogTargetCreateLogTargetHandler == nil {
 		unregistered = append(unregistered, "log_target.CreateLogTargetHandler")
 	}
-
 	if o.NameserverCreateNameserverHandler == nil {
 		unregistered = append(unregistered, "nameserver.CreateNameserverHandler")
 	}
-
 	if o.PeerCreatePeerHandler == nil {
 		unregistered = append(unregistered, "peer.CreatePeerHandler")
 	}
-
 	if o.PeerEntryCreatePeerEntryHandler == nil {
 		unregistered = append(unregistered, "peer_entry.CreatePeerEntryHandler")
 	}
-
 	if o.ResolverCreateResolverHandler == nil {
 		unregistered = append(unregistered, "resolver.CreateResolverHandler")
 	}
-
 	if o.MapsCreateRuntimeMapHandler == nil {
 		unregistered = append(unregistered, "maps.CreateRuntimeMapHandler")
 	}
-
 	if o.ServerCreateServerHandler == nil {
 		unregistered = append(unregistered, "server.CreateServerHandler")
 	}
-
 	if o.ServerSwitchingRuleCreateServerSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "server_switching_rule.CreateServerSwitchingRuleHandler")
 	}
-
 	if o.SitesCreateSiteHandler == nil {
 		unregistered = append(unregistered, "sites.CreateSiteHandler")
 	}
-
 	if o.StickRuleCreateStickRuleHandler == nil {
 		unregistered = append(unregistered, "stick_rule.CreateStickRuleHandler")
 	}
-
 	if o.TCPRequestRuleCreateTCPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_request_rule.CreateTCPRequestRuleHandler")
 	}
-
 	if o.TCPResponseRuleCreateTCPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_response_rule.CreateTCPResponseRuleHandler")
 	}
-
 	if o.ACLDeleteACLHandler == nil {
 		unregistered = append(unregistered, "acl.DeleteACLHandler")
 	}
-
 	if o.BackendDeleteBackendHandler == nil {
 		unregistered = append(unregistered, "backend.DeleteBackendHandler")
 	}
-
 	if o.BackendSwitchingRuleDeleteBackendSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "backend_switching_rule.DeleteBackendSwitchingRuleHandler")
 	}
-
 	if o.BindDeleteBindHandler == nil {
 		unregistered = append(unregistered, "bind.DeleteBindHandler")
 	}
-
 	if o.FilterDeleteFilterHandler == nil {
 		unregistered = append(unregistered, "filter.DeleteFilterHandler")
 	}
-
 	if o.FrontendDeleteFrontendHandler == nil {
 		unregistered = append(unregistered, "frontend.DeleteFrontendHandler")
 	}
-
 	if o.HTTPRequestRuleDeleteHTTPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "http_request_rule.DeleteHTTPRequestRuleHandler")
 	}
-
 	if o.HTTPResponseRuleDeleteHTTPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "http_response_rule.DeleteHTTPResponseRuleHandler")
 	}
-
 	if o.LogTargetDeleteLogTargetHandler == nil {
 		unregistered = append(unregistered, "log_target.DeleteLogTargetHandler")
 	}
-
 	if o.NameserverDeleteNameserverHandler == nil {
 		unregistered = append(unregistered, "nameserver.DeleteNameserverHandler")
 	}
-
 	if o.PeerDeletePeerHandler == nil {
 		unregistered = append(unregistered, "peer.DeletePeerHandler")
 	}
-
 	if o.PeerEntryDeletePeerEntryHandler == nil {
 		unregistered = append(unregistered, "peer_entry.DeletePeerEntryHandler")
 	}
-
 	if o.ResolverDeleteResolverHandler == nil {
 		unregistered = append(unregistered, "resolver.DeleteResolverHandler")
 	}
-
 	if o.MapsDeleteRuntimeMapEntryHandler == nil {
 		unregistered = append(unregistered, "maps.DeleteRuntimeMapEntryHandler")
 	}
-
 	if o.ServerDeleteServerHandler == nil {
 		unregistered = append(unregistered, "server.DeleteServerHandler")
 	}
-
 	if o.ServerSwitchingRuleDeleteServerSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "server_switching_rule.DeleteServerSwitchingRuleHandler")
 	}
-
 	if o.SitesDeleteSiteHandler == nil {
 		unregistered = append(unregistered, "sites.DeleteSiteHandler")
 	}
-
 	if o.StickRuleDeleteStickRuleHandler == nil {
 		unregistered = append(unregistered, "stick_rule.DeleteStickRuleHandler")
 	}
-
 	if o.TCPRequestRuleDeleteTCPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_request_rule.DeleteTCPRequestRuleHandler")
 	}
-
 	if o.TCPResponseRuleDeleteTCPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_response_rule.DeleteTCPResponseRuleHandler")
 	}
-
 	if o.TransactionsDeleteTransactionHandler == nil {
 		unregistered = append(unregistered, "transactions.DeleteTransactionHandler")
 	}
-
 	if o.DiscoveryGetAPIEndpointsHandler == nil {
 		unregistered = append(unregistered, "discovery.GetAPIEndpointsHandler")
 	}
-
 	if o.ACLGetACLHandler == nil {
 		unregistered = append(unregistered, "acl.GetACLHandler")
 	}
-
 	if o.ACLGetAclsHandler == nil {
 		unregistered = append(unregistered, "acl.GetAclsHandler")
 	}
-
 	if o.MapsGetAllRuntimeMapFilesHandler == nil {
 		unregistered = append(unregistered, "maps.GetAllRuntimeMapFilesHandler")
 	}
-
 	if o.BackendGetBackendHandler == nil {
 		unregistered = append(unregistered, "backend.GetBackendHandler")
 	}
-
 	if o.BackendSwitchingRuleGetBackendSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "backend_switching_rule.GetBackendSwitchingRuleHandler")
 	}
-
 	if o.BackendSwitchingRuleGetBackendSwitchingRulesHandler == nil {
 		unregistered = append(unregistered, "backend_switching_rule.GetBackendSwitchingRulesHandler")
 	}
-
 	if o.BackendGetBackendsHandler == nil {
 		unregistered = append(unregistered, "backend.GetBackendsHandler")
 	}
-
 	if o.BindGetBindHandler == nil {
 		unregistered = append(unregistered, "bind.GetBindHandler")
 	}
-
 	if o.BindGetBindsHandler == nil {
 		unregistered = append(unregistered, "bind.GetBindsHandler")
 	}
-
 	if o.DiscoveryGetClusterHandler == nil {
 		unregistered = append(unregistered, "discovery.GetClusterHandler")
 	}
-
 	if o.DiscoveryGetConfigurationEndpointsHandler == nil {
 		unregistered = append(unregistered, "discovery.GetConfigurationEndpointsHandler")
 	}
-
 	if o.DefaultsGetDefaultsHandler == nil {
 		unregistered = append(unregistered, "defaults.GetDefaultsHandler")
 	}
-
 	if o.FilterGetFilterHandler == nil {
 		unregistered = append(unregistered, "filter.GetFilterHandler")
 	}
-
 	if o.FilterGetFiltersHandler == nil {
 		unregistered = append(unregistered, "filter.GetFiltersHandler")
 	}
-
 	if o.FrontendGetFrontendHandler == nil {
 		unregistered = append(unregistered, "frontend.GetFrontendHandler")
 	}
-
 	if o.FrontendGetFrontendsHandler == nil {
 		unregistered = append(unregistered, "frontend.GetFrontendsHandler")
 	}
-
 	if o.GlobalGetGlobalHandler == nil {
 		unregistered = append(unregistered, "global.GetGlobalHandler")
 	}
-
 	if o.ConfigurationGetHAProxyConfigurationHandler == nil {
 		unregistered = append(unregistered, "configuration.GetHAProxyConfigurationHandler")
 	}
-
 	if o.HTTPRequestRuleGetHTTPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "http_request_rule.GetHTTPRequestRuleHandler")
 	}
-
 	if o.HTTPRequestRuleGetHTTPRequestRulesHandler == nil {
 		unregistered = append(unregistered, "http_request_rule.GetHTTPRequestRulesHandler")
 	}
-
 	if o.HTTPResponseRuleGetHTTPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "http_response_rule.GetHTTPResponseRuleHandler")
 	}
-
 	if o.HTTPResponseRuleGetHTTPResponseRulesHandler == nil {
 		unregistered = append(unregistered, "http_response_rule.GetHTTPResponseRulesHandler")
 	}
-
 	if o.DiscoveryGetHaproxyEndpointsHandler == nil {
 		unregistered = append(unregistered, "discovery.GetHaproxyEndpointsHandler")
 	}
-
 	if o.InformationGetHaproxyProcessInfoHandler == nil {
 		unregistered = append(unregistered, "information.GetHaproxyProcessInfoHandler")
 	}
-
 	if o.InformationGetInfoHandler == nil {
 		unregistered = append(unregistered, "information.GetInfoHandler")
 	}
-
 	if o.LogTargetGetLogTargetHandler == nil {
 		unregistered = append(unregistered, "log_target.GetLogTargetHandler")
 	}
-
 	if o.LogTargetGetLogTargetsHandler == nil {
 		unregistered = append(unregistered, "log_target.GetLogTargetsHandler")
 	}
-
 	if o.NameserverGetNameserverHandler == nil {
 		unregistered = append(unregistered, "nameserver.GetNameserverHandler")
 	}
-
 	if o.NameserverGetNameserversHandler == nil {
 		unregistered = append(unregistered, "nameserver.GetNameserversHandler")
 	}
-
 	if o.MapsGetOneRuntimeMapHandler == nil {
 		unregistered = append(unregistered, "maps.GetOneRuntimeMapHandler")
 	}
-
 	if o.PeerEntryGetPeerEntriesHandler == nil {
 		unregistered = append(unregistered, "peer_entry.GetPeerEntriesHandler")
 	}
-
 	if o.PeerEntryGetPeerEntryHandler == nil {
 		unregistered = append(unregistered, "peer_entry.GetPeerEntryHandler")
 	}
-
 	if o.PeerGetPeerSectionHandler == nil {
 		unregistered = append(unregistered, "peer.GetPeerSectionHandler")
 	}
-
 	if o.PeerGetPeerSectionsHandler == nil {
 		unregistered = append(unregistered, "peer.GetPeerSectionsHandler")
 	}
-
 	if o.ReloadsGetReloadHandler == nil {
 		unregistered = append(unregistered, "reloads.GetReloadHandler")
 	}
-
 	if o.ReloadsGetReloadsHandler == nil {
 		unregistered = append(unregistered, "reloads.GetReloadsHandler")
 	}
-
 	if o.ResolverGetResolverHandler == nil {
 		unregistered = append(unregistered, "resolver.GetResolverHandler")
 	}
-
 	if o.ResolverGetResolversHandler == nil {
 		unregistered = append(unregistered, "resolver.GetResolversHandler")
 	}
-
 	if o.DiscoveryGetRuntimeEndpointsHandler == nil {
 		unregistered = append(unregistered, "discovery.GetRuntimeEndpointsHandler")
 	}
-
 	if o.MapsGetRuntimeMapEntryHandler == nil {
 		unregistered = append(unregistered, "maps.GetRuntimeMapEntryHandler")
 	}
-
 	if o.ServerGetRuntimeServerHandler == nil {
 		unregistered = append(unregistered, "server.GetRuntimeServerHandler")
 	}
-
 	if o.ServerGetRuntimeServersHandler == nil {
 		unregistered = append(unregistered, "server.GetRuntimeServersHandler")
 	}
-
 	if o.ServerGetServerHandler == nil {
 		unregistered = append(unregistered, "server.GetServerHandler")
 	}
-
 	if o.ServerSwitchingRuleGetServerSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "server_switching_rule.GetServerSwitchingRuleHandler")
 	}
-
 	if o.ServerSwitchingRuleGetServerSwitchingRulesHandler == nil {
 		unregistered = append(unregistered, "server_switching_rule.GetServerSwitchingRulesHandler")
 	}
-
 	if o.ServerGetServersHandler == nil {
 		unregistered = append(unregistered, "server.GetServersHandler")
 	}
-
 	if o.DiscoveryGetServicesEndpointsHandler == nil {
 		unregistered = append(unregistered, "discovery.GetServicesEndpointsHandler")
 	}
-
 	if o.SitesGetSiteHandler == nil {
 		unregistered = append(unregistered, "sites.GetSiteHandler")
 	}
-
 	if o.SitesGetSitesHandler == nil {
 		unregistered = append(unregistered, "sites.GetSitesHandler")
 	}
-
 	if o.SpecificationGetSpecificationHandler == nil {
 		unregistered = append(unregistered, "specification.GetSpecificationHandler")
 	}
-
 	if o.StatsGetStatsHandler == nil {
 		unregistered = append(unregistered, "stats.GetStatsHandler")
 	}
-
 	if o.DiscoveryGetStatsEndpointsHandler == nil {
 		unregistered = append(unregistered, "discovery.GetStatsEndpointsHandler")
 	}
-
 	if o.StickRuleGetStickRuleHandler == nil {
 		unregistered = append(unregistered, "stick_rule.GetStickRuleHandler")
 	}
-
 	if o.StickRuleGetStickRulesHandler == nil {
 		unregistered = append(unregistered, "stick_rule.GetStickRulesHandler")
 	}
-
 	if o.StickTableGetStickTableHandler == nil {
 		unregistered = append(unregistered, "stick_table.GetStickTableHandler")
 	}
-
 	if o.StickTableGetStickTableEntriesHandler == nil {
 		unregistered = append(unregistered, "stick_table.GetStickTableEntriesHandler")
 	}
-
 	if o.StickTableGetStickTablesHandler == nil {
 		unregistered = append(unregistered, "stick_table.GetStickTablesHandler")
 	}
-
 	if o.TCPRequestRuleGetTCPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_request_rule.GetTCPRequestRuleHandler")
 	}
-
 	if o.TCPRequestRuleGetTCPRequestRulesHandler == nil {
 		unregistered = append(unregistered, "tcp_request_rule.GetTCPRequestRulesHandler")
 	}
-
 	if o.TCPResponseRuleGetTCPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_response_rule.GetTCPResponseRuleHandler")
 	}
-
 	if o.TCPResponseRuleGetTCPResponseRulesHandler == nil {
 		unregistered = append(unregistered, "tcp_response_rule.GetTCPResponseRulesHandler")
 	}
-
 	if o.TransactionsGetTransactionHandler == nil {
 		unregistered = append(unregistered, "transactions.GetTransactionHandler")
 	}
-
 	if o.TransactionsGetTransactionsHandler == nil {
 		unregistered = append(unregistered, "transactions.GetTransactionsHandler")
 	}
-
 	if o.ClusterInitiateCertificateRefreshHandler == nil {
 		unregistered = append(unregistered, "cluster.InitiateCertificateRefreshHandler")
 	}
-
 	if o.ClusterPostClusterHandler == nil {
 		unregistered = append(unregistered, "cluster.PostClusterHandler")
 	}
-
 	if o.ConfigurationPostHAProxyConfigurationHandler == nil {
 		unregistered = append(unregistered, "configuration.PostHAProxyConfigurationHandler")
 	}
-
 	if o.ACLReplaceACLHandler == nil {
 		unregistered = append(unregistered, "acl.ReplaceACLHandler")
 	}
-
 	if o.BackendReplaceBackendHandler == nil {
 		unregistered = append(unregistered, "backend.ReplaceBackendHandler")
 	}
-
 	if o.BackendSwitchingRuleReplaceBackendSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "backend_switching_rule.ReplaceBackendSwitchingRuleHandler")
 	}
-
 	if o.BindReplaceBindHandler == nil {
 		unregistered = append(unregistered, "bind.ReplaceBindHandler")
 	}
-
 	if o.DefaultsReplaceDefaultsHandler == nil {
 		unregistered = append(unregistered, "defaults.ReplaceDefaultsHandler")
 	}
-
 	if o.FilterReplaceFilterHandler == nil {
 		unregistered = append(unregistered, "filter.ReplaceFilterHandler")
 	}
-
 	if o.FrontendReplaceFrontendHandler == nil {
 		unregistered = append(unregistered, "frontend.ReplaceFrontendHandler")
 	}
-
 	if o.GlobalReplaceGlobalHandler == nil {
 		unregistered = append(unregistered, "global.ReplaceGlobalHandler")
 	}
-
 	if o.HTTPRequestRuleReplaceHTTPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "http_request_rule.ReplaceHTTPRequestRuleHandler")
 	}
-
 	if o.HTTPResponseRuleReplaceHTTPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "http_response_rule.ReplaceHTTPResponseRuleHandler")
 	}
-
 	if o.LogTargetReplaceLogTargetHandler == nil {
 		unregistered = append(unregistered, "log_target.ReplaceLogTargetHandler")
 	}
-
 	if o.NameserverReplaceNameserverHandler == nil {
 		unregistered = append(unregistered, "nameserver.ReplaceNameserverHandler")
 	}
-
 	if o.PeerEntryReplacePeerEntryHandler == nil {
 		unregistered = append(unregistered, "peer_entry.ReplacePeerEntryHandler")
 	}
-
 	if o.ResolverReplaceResolverHandler == nil {
 		unregistered = append(unregistered, "resolver.ReplaceResolverHandler")
 	}
-
 	if o.MapsReplaceRuntimeMapEntryHandler == nil {
 		unregistered = append(unregistered, "maps.ReplaceRuntimeMapEntryHandler")
 	}
-
 	if o.ServerReplaceRuntimeServerHandler == nil {
 		unregistered = append(unregistered, "server.ReplaceRuntimeServerHandler")
 	}
-
 	if o.ServerReplaceServerHandler == nil {
 		unregistered = append(unregistered, "server.ReplaceServerHandler")
 	}
-
 	if o.ServerSwitchingRuleReplaceServerSwitchingRuleHandler == nil {
 		unregistered = append(unregistered, "server_switching_rule.ReplaceServerSwitchingRuleHandler")
 	}
-
 	if o.SitesReplaceSiteHandler == nil {
 		unregistered = append(unregistered, "sites.ReplaceSiteHandler")
 	}
-
 	if o.StickRuleReplaceStickRuleHandler == nil {
 		unregistered = append(unregistered, "stick_rule.ReplaceStickRuleHandler")
 	}
-
 	if o.TCPRequestRuleReplaceTCPRequestRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_request_rule.ReplaceTCPRequestRuleHandler")
 	}
-
 	if o.TCPResponseRuleReplaceTCPResponseRuleHandler == nil {
 		unregistered = append(unregistered, "tcp_response_rule.ReplaceTCPResponseRuleHandler")
 	}
-
 	if o.MapsShowRuntimeMapHandler == nil {
 		unregistered = append(unregistered, "maps.ShowRuntimeMapHandler")
 	}
-
 	if o.TransactionsStartTransactionHandler == nil {
 		unregistered = append(unregistered, "transactions.StartTransactionHandler")
 	}
@@ -1442,44 +1316,34 @@ func (o *DataPlaneAPI) ServeErrorFor(operationID string) func(http.ResponseWrite
 
 // AuthenticatorsFor gets the authenticators for the specified security schemes
 func (o *DataPlaneAPI) AuthenticatorsFor(schemes map[string]spec.SecurityScheme) map[string]runtime.Authenticator {
-
 	result := make(map[string]runtime.Authenticator)
-	for name, scheme := range schemes {
+	for name := range schemes {
 		switch name {
-
 		case "basic_auth":
-			_ = scheme
 			result[name] = o.BasicAuthenticator(o.BasicAuthAuth)
 
 		}
 	}
 	return result
-
 }
 
 // Authorizer returns the registered authorizer
 func (o *DataPlaneAPI) Authorizer() runtime.Authorizer {
-
 	return o.APIAuthorizer
-
 }
 
-// ConsumersFor gets the consumers for the specified media types
+// ConsumersFor gets the consumers for the specified media types.
+// MIME type parameters are ignored here.
 func (o *DataPlaneAPI) ConsumersFor(mediaTypes []string) map[string]runtime.Consumer {
-
-	result := make(map[string]runtime.Consumer)
+	result := make(map[string]runtime.Consumer, len(mediaTypes))
 	for _, mt := range mediaTypes {
 		switch mt {
-
 		case "application/json":
 			result["application/json"] = o.JSONConsumer
-
 		case "multipart/form-data":
 			result["multipart/form-data"] = o.MultipartformConsumer
-
 		case "text/plain":
 			result["text/plain"] = o.TxtConsumer
-
 		}
 
 		if c, ok := o.customConsumers[mt]; ok {
@@ -1487,19 +1351,16 @@ func (o *DataPlaneAPI) ConsumersFor(mediaTypes []string) map[string]runtime.Cons
 		}
 	}
 	return result
-
 }
 
-// ProducersFor gets the producers for the specified media types
+// ProducersFor gets the producers for the specified media types.
+// MIME type parameters are ignored here.
 func (o *DataPlaneAPI) ProducersFor(mediaTypes []string) map[string]runtime.Producer {
-
-	result := make(map[string]runtime.Producer)
+	result := make(map[string]runtime.Producer, len(mediaTypes))
 	for _, mt := range mediaTypes {
 		switch mt {
-
 		case "application/json":
 			result["application/json"] = o.JSONProducer
-
 		}
 
 		if p, ok := o.customProducers[mt]; ok {
@@ -1507,7 +1368,6 @@ func (o *DataPlaneAPI) ProducersFor(mediaTypes []string) map[string]runtime.Prod
 		}
 	}
 	return result
-
 }
 
 // HandlerFor gets a http.Handler for the provided operation method and path
@@ -1537,7 +1397,6 @@ func (o *DataPlaneAPI) Context() *middleware.Context {
 
 func (o *DataPlaneAPI) initHandlerCache() {
 	o.Context() // don't care about the result, just that the initialization happened
-
 	if o.handlers == nil {
 		o.handlers = make(map[string]map[string]http.Handler)
 	}
@@ -1546,677 +1405,542 @@ func (o *DataPlaneAPI) initHandlerCache() {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/runtime/maps_entries"] = maps.NewAddMapEntry(o.context, o.MapsAddMapEntryHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/runtime/maps/{name}"] = maps.NewClearRuntimeMap(o.context, o.MapsClearRuntimeMapHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/transactions/{id}"] = transactions.NewCommitTransaction(o.context, o.TransactionsCommitTransactionHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/acls"] = acl.NewCreateACL(o.context, o.ACLCreateACLHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/backends"] = backend.NewCreateBackend(o.context, o.BackendCreateBackendHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/backend_switching_rules"] = backend_switching_rule.NewCreateBackendSwitchingRule(o.context, o.BackendSwitchingRuleCreateBackendSwitchingRuleHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/binds"] = bind.NewCreateBind(o.context, o.BindCreateBindHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/filters"] = filter.NewCreateFilter(o.context, o.FilterCreateFilterHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/frontends"] = frontend.NewCreateFrontend(o.context, o.FrontendCreateFrontendHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/http_request_rules"] = http_request_rule.NewCreateHTTPRequestRule(o.context, o.HTTPRequestRuleCreateHTTPRequestRuleHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/http_response_rules"] = http_response_rule.NewCreateHTTPResponseRule(o.context, o.HTTPResponseRuleCreateHTTPResponseRuleHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/log_targets"] = log_target.NewCreateLogTarget(o.context, o.LogTargetCreateLogTargetHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/nameservers"] = nameserver.NewCreateNameserver(o.context, o.NameserverCreateNameserverHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/peer_section"] = peer.NewCreatePeer(o.context, o.PeerCreatePeerHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/peer_entries"] = peer_entry.NewCreatePeerEntry(o.context, o.PeerEntryCreatePeerEntryHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/resolvers"] = resolver.NewCreateResolver(o.context, o.ResolverCreateResolverHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/runtime/maps"] = maps.NewCreateRuntimeMap(o.context, o.MapsCreateRuntimeMapHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/servers"] = server.NewCreateServer(o.context, o.ServerCreateServerHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/server_switching_rules"] = server_switching_rule.NewCreateServerSwitchingRule(o.context, o.ServerSwitchingRuleCreateServerSwitchingRuleHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/sites"] = sites.NewCreateSite(o.context, o.SitesCreateSiteHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/stick_rules"] = stick_rule.NewCreateStickRule(o.context, o.StickRuleCreateStickRuleHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/tcp_request_rules"] = tcp_request_rule.NewCreateTCPRequestRule(o.context, o.TCPRequestRuleCreateTCPRequestRuleHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/tcp_response_rules"] = tcp_response_rule.NewCreateTCPResponseRule(o.context, o.TCPResponseRuleCreateTCPResponseRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/acls/{index}"] = acl.NewDeleteACL(o.context, o.ACLDeleteACLHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/backends/{name}"] = backend.NewDeleteBackend(o.context, o.BackendDeleteBackendHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/backend_switching_rules/{index}"] = backend_switching_rule.NewDeleteBackendSwitchingRule(o.context, o.BackendSwitchingRuleDeleteBackendSwitchingRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/binds/{name}"] = bind.NewDeleteBind(o.context, o.BindDeleteBindHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/filters/{index}"] = filter.NewDeleteFilter(o.context, o.FilterDeleteFilterHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/frontends/{name}"] = frontend.NewDeleteFrontend(o.context, o.FrontendDeleteFrontendHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/http_request_rules/{index}"] = http_request_rule.NewDeleteHTTPRequestRule(o.context, o.HTTPRequestRuleDeleteHTTPRequestRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/http_response_rules/{index}"] = http_response_rule.NewDeleteHTTPResponseRule(o.context, o.HTTPResponseRuleDeleteHTTPResponseRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/log_targets/{index}"] = log_target.NewDeleteLogTarget(o.context, o.LogTargetDeleteLogTargetHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/nameservers/{name}"] = nameserver.NewDeleteNameserver(o.context, o.NameserverDeleteNameserverHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/peer_section/{name}"] = peer.NewDeletePeer(o.context, o.PeerDeletePeerHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/peer_entries/{name}"] = peer_entry.NewDeletePeerEntry(o.context, o.PeerEntryDeletePeerEntryHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/resolvers/{name}"] = resolver.NewDeleteResolver(o.context, o.ResolverDeleteResolverHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/runtime/maps_entries/{id}"] = maps.NewDeleteRuntimeMapEntry(o.context, o.MapsDeleteRuntimeMapEntryHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/servers/{name}"] = server.NewDeleteServer(o.context, o.ServerDeleteServerHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/server_switching_rules/{index}"] = server_switching_rule.NewDeleteServerSwitchingRule(o.context, o.ServerSwitchingRuleDeleteServerSwitchingRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/sites/{name}"] = sites.NewDeleteSite(o.context, o.SitesDeleteSiteHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/stick_rules/{index}"] = stick_rule.NewDeleteStickRule(o.context, o.StickRuleDeleteStickRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/tcp_request_rules/{index}"] = tcp_request_rule.NewDeleteTCPRequestRule(o.context, o.TCPRequestRuleDeleteTCPRequestRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/configuration/tcp_response_rules/{index}"] = tcp_response_rule.NewDeleteTCPResponseRule(o.context, o.TCPResponseRuleDeleteTCPResponseRuleHandler)
-
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/services/haproxy/transactions/{id}"] = transactions.NewDeleteTransaction(o.context, o.TransactionsDeleteTransactionHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"][""] = discovery.NewGetAPIEndpoints(o.context, o.DiscoveryGetAPIEndpointsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/acls/{index}"] = acl.NewGetACL(o.context, o.ACLGetACLHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/acls"] = acl.NewGetAcls(o.context, o.ACLGetAclsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/maps"] = maps.NewGetAllRuntimeMapFiles(o.context, o.MapsGetAllRuntimeMapFilesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/backends/{name}"] = backend.NewGetBackend(o.context, o.BackendGetBackendHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/backend_switching_rules/{index}"] = backend_switching_rule.NewGetBackendSwitchingRule(o.context, o.BackendSwitchingRuleGetBackendSwitchingRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/backend_switching_rules"] = backend_switching_rule.NewGetBackendSwitchingRules(o.context, o.BackendSwitchingRuleGetBackendSwitchingRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/backends"] = backend.NewGetBackends(o.context, o.BackendGetBackendsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/binds/{name}"] = bind.NewGetBind(o.context, o.BindGetBindHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/binds"] = bind.NewGetBinds(o.context, o.BindGetBindsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/cluster"] = discovery.NewGetCluster(o.context, o.DiscoveryGetClusterHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration"] = discovery.NewGetConfigurationEndpoints(o.context, o.DiscoveryGetConfigurationEndpointsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/defaults"] = defaults.NewGetDefaults(o.context, o.DefaultsGetDefaultsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/filters/{index}"] = filter.NewGetFilter(o.context, o.FilterGetFilterHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/filters"] = filter.NewGetFilters(o.context, o.FilterGetFiltersHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/frontends/{name}"] = frontend.NewGetFrontend(o.context, o.FrontendGetFrontendHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/frontends"] = frontend.NewGetFrontends(o.context, o.FrontendGetFrontendsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/global"] = global.NewGetGlobal(o.context, o.GlobalGetGlobalHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/raw"] = configuration.NewGetHAProxyConfiguration(o.context, o.ConfigurationGetHAProxyConfigurationHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/http_request_rules/{index}"] = http_request_rule.NewGetHTTPRequestRule(o.context, o.HTTPRequestRuleGetHTTPRequestRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/http_request_rules"] = http_request_rule.NewGetHTTPRequestRules(o.context, o.HTTPRequestRuleGetHTTPRequestRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/http_response_rules/{index}"] = http_response_rule.NewGetHTTPResponseRule(o.context, o.HTTPResponseRuleGetHTTPResponseRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/http_response_rules"] = http_response_rule.NewGetHTTPResponseRules(o.context, o.HTTPResponseRuleGetHTTPResponseRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy"] = discovery.NewGetHaproxyEndpoints(o.context, o.DiscoveryGetHaproxyEndpointsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/info"] = information.NewGetHaproxyProcessInfo(o.context, o.InformationGetHaproxyProcessInfoHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/info"] = information.NewGetInfo(o.context, o.InformationGetInfoHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/log_targets/{index}"] = log_target.NewGetLogTarget(o.context, o.LogTargetGetLogTargetHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/log_targets"] = log_target.NewGetLogTargets(o.context, o.LogTargetGetLogTargetsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/nameservers/{name}"] = nameserver.NewGetNameserver(o.context, o.NameserverGetNameserverHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/nameservers"] = nameserver.NewGetNameservers(o.context, o.NameserverGetNameserversHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/maps/{name}"] = maps.NewGetOneRuntimeMap(o.context, o.MapsGetOneRuntimeMapHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/peer_entries"] = peer_entry.NewGetPeerEntries(o.context, o.PeerEntryGetPeerEntriesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/peer_entries/{name}"] = peer_entry.NewGetPeerEntry(o.context, o.PeerEntryGetPeerEntryHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/peer_section/{name}"] = peer.NewGetPeerSection(o.context, o.PeerGetPeerSectionHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/peer_section"] = peer.NewGetPeerSections(o.context, o.PeerGetPeerSectionsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/reloads/{id}"] = reloads.NewGetReload(o.context, o.ReloadsGetReloadHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/reloads"] = reloads.NewGetReloads(o.context, o.ReloadsGetReloadsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/resolvers/{name}"] = resolver.NewGetResolver(o.context, o.ResolverGetResolverHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/resolvers"] = resolver.NewGetResolvers(o.context, o.ResolverGetResolversHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime"] = discovery.NewGetRuntimeEndpoints(o.context, o.DiscoveryGetRuntimeEndpointsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/maps_entries/{id}"] = maps.NewGetRuntimeMapEntry(o.context, o.MapsGetRuntimeMapEntryHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/servers/{name}"] = server.NewGetRuntimeServer(o.context, o.ServerGetRuntimeServerHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/servers"] = server.NewGetRuntimeServers(o.context, o.ServerGetRuntimeServersHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/servers/{name}"] = server.NewGetServer(o.context, o.ServerGetServerHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/server_switching_rules/{index}"] = server_switching_rule.NewGetServerSwitchingRule(o.context, o.ServerSwitchingRuleGetServerSwitchingRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/server_switching_rules"] = server_switching_rule.NewGetServerSwitchingRules(o.context, o.ServerSwitchingRuleGetServerSwitchingRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/servers"] = server.NewGetServers(o.context, o.ServerGetServersHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services"] = discovery.NewGetServicesEndpoints(o.context, o.DiscoveryGetServicesEndpointsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/sites/{name}"] = sites.NewGetSite(o.context, o.SitesGetSiteHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/sites"] = sites.NewGetSites(o.context, o.SitesGetSitesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/specification"] = specification.NewGetSpecification(o.context, o.SpecificationGetSpecificationHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/stats/native"] = stats.NewGetStats(o.context, o.StatsGetStatsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/stats"] = discovery.NewGetStatsEndpoints(o.context, o.DiscoveryGetStatsEndpointsHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/stick_rules/{index}"] = stick_rule.NewGetStickRule(o.context, o.StickRuleGetStickRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/stick_rules"] = stick_rule.NewGetStickRules(o.context, o.StickRuleGetStickRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/stick_tables/{name}"] = stick_table.NewGetStickTable(o.context, o.StickTableGetStickTableHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/stick_table_entries"] = stick_table.NewGetStickTableEntries(o.context, o.StickTableGetStickTableEntriesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/stick_tables"] = stick_table.NewGetStickTables(o.context, o.StickTableGetStickTablesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/tcp_request_rules/{index}"] = tcp_request_rule.NewGetTCPRequestRule(o.context, o.TCPRequestRuleGetTCPRequestRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/tcp_request_rules"] = tcp_request_rule.NewGetTCPRequestRules(o.context, o.TCPRequestRuleGetTCPRequestRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/tcp_response_rules/{index}"] = tcp_response_rule.NewGetTCPResponseRule(o.context, o.TCPResponseRuleGetTCPResponseRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/configuration/tcp_response_rules"] = tcp_response_rule.NewGetTCPResponseRules(o.context, o.TCPResponseRuleGetTCPResponseRulesHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/transactions/{id}"] = transactions.NewGetTransaction(o.context, o.TransactionsGetTransactionHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/transactions"] = transactions.NewGetTransactions(o.context, o.TransactionsGetTransactionsHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/cluster/certificate"] = cluster.NewInitiateCertificateRefresh(o.context, o.ClusterInitiateCertificateRefreshHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/cluster"] = cluster.NewPostCluster(o.context, o.ClusterPostClusterHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/configuration/raw"] = configuration.NewPostHAProxyConfiguration(o.context, o.ConfigurationPostHAProxyConfigurationHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/acls/{index}"] = acl.NewReplaceACL(o.context, o.ACLReplaceACLHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/backends/{name}"] = backend.NewReplaceBackend(o.context, o.BackendReplaceBackendHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/backend_switching_rules/{index}"] = backend_switching_rule.NewReplaceBackendSwitchingRule(o.context, o.BackendSwitchingRuleReplaceBackendSwitchingRuleHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/binds/{name}"] = bind.NewReplaceBind(o.context, o.BindReplaceBindHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/defaults"] = defaults.NewReplaceDefaults(o.context, o.DefaultsReplaceDefaultsHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/filters/{index}"] = filter.NewReplaceFilter(o.context, o.FilterReplaceFilterHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/frontends/{name}"] = frontend.NewReplaceFrontend(o.context, o.FrontendReplaceFrontendHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/global"] = global.NewReplaceGlobal(o.context, o.GlobalReplaceGlobalHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/http_request_rules/{index}"] = http_request_rule.NewReplaceHTTPRequestRule(o.context, o.HTTPRequestRuleReplaceHTTPRequestRuleHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/http_response_rules/{index}"] = http_response_rule.NewReplaceHTTPResponseRule(o.context, o.HTTPResponseRuleReplaceHTTPResponseRuleHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/log_targets/{index}"] = log_target.NewReplaceLogTarget(o.context, o.LogTargetReplaceLogTargetHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/nameservers/{name}"] = nameserver.NewReplaceNameserver(o.context, o.NameserverReplaceNameserverHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/peer_entries/{name}"] = peer_entry.NewReplacePeerEntry(o.context, o.PeerEntryReplacePeerEntryHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/resolvers/{name}"] = resolver.NewReplaceResolver(o.context, o.ResolverReplaceResolverHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/runtime/maps_entries/{id}"] = maps.NewReplaceRuntimeMapEntry(o.context, o.MapsReplaceRuntimeMapEntryHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/runtime/servers/{name}"] = server.NewReplaceRuntimeServer(o.context, o.ServerReplaceRuntimeServerHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/servers/{name}"] = server.NewReplaceServer(o.context, o.ServerReplaceServerHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/server_switching_rules/{index}"] = server_switching_rule.NewReplaceServerSwitchingRule(o.context, o.ServerSwitchingRuleReplaceServerSwitchingRuleHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/sites/{name}"] = sites.NewReplaceSite(o.context, o.SitesReplaceSiteHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/stick_rules/{index}"] = stick_rule.NewReplaceStickRule(o.context, o.StickRuleReplaceStickRuleHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/tcp_request_rules/{index}"] = tcp_request_rule.NewReplaceTCPRequestRule(o.context, o.TCPRequestRuleReplaceTCPRequestRuleHandler)
-
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/services/haproxy/configuration/tcp_response_rules/{index}"] = tcp_response_rule.NewReplaceTCPResponseRule(o.context, o.TCPResponseRuleReplaceTCPResponseRuleHandler)
-
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/services/haproxy/runtime/maps_entries"] = maps.NewShowRuntimeMap(o.context, o.MapsShowRuntimeMapHandler)
-
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/services/haproxy/transactions"] = transactions.NewStartTransaction(o.context, o.TransactionsStartTransactionHandler)
-
 }
 
 // Serve creates a http handler to serve the API over HTTP
@@ -2246,3 +1970,15 @@ func (o *DataPlaneAPI) RegisterConsumer(mediaType string, consumer runtime.Consu
 func (o *DataPlaneAPI) RegisterProducer(mediaType string, producer runtime.Producer) {
 	o.customProducers[mediaType] = producer
 }
+
+// AddMiddlewareFor adds a http middleware to existing handler
+func (o *DataPlaneAPI) AddMiddlewareFor(method, path string, builder middleware.Builder) {
+	um := strings.ToUpper(method)
+	if path == "/" {
+		path = ""
+	}
+	o.Init()
+	if h, ok := o.handlers[um][path]; ok {
+		o.handlers[method][path] = builder(h)
+	}
+}
diff --git a/operations/defaults/get_defaults.go b/operations/defaults/get_defaults.go
index bb26be43..1b405d7e 100644
--- a/operations/defaults/get_defaults.go
+++ b/operations/defaults/get_defaults.go
@@ -23,12 +23,12 @@ package defaults
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetDefaultsHandlerFunc turns a function with the right signature into a get defaults handler
@@ -93,6 +93,7 @@ func (o *GetDefaults) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetDefaultsOKBody get defaults o k body
+//
 // swagger:model GetDefaultsOKBody
 type GetDefaultsOKBody struct {
 
diff --git a/operations/defaults/get_defaults_parameters.go b/operations/defaults/get_defaults_parameters.go
index 33541991..adeab66a 100644
--- a/operations/defaults/get_defaults_parameters.go
+++ b/operations/defaults/get_defaults_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetDefaultsParams creates a new GetDefaultsParams object
diff --git a/operations/defaults/get_defaults_responses.go b/operations/defaults/get_defaults_responses.go
index 465777f4..5207fd92 100644
--- a/operations/defaults/get_defaults_responses.go
+++ b/operations/defaults/get_defaults_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetDefaultsOKCode is the HTTP code returned for type GetDefaultsOK
diff --git a/operations/defaults/get_defaults_urlbuilder.go b/operations/defaults/get_defaults_urlbuilder.go
index b3806b4b..dc2dcfca 100644
--- a/operations/defaults/get_defaults_urlbuilder.go
+++ b/operations/defaults/get_defaults_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetDefaultsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/defaults/replace_defaults.go b/operations/defaults/replace_defaults.go
index 9d1227d8..04feba72 100644
--- a/operations/defaults/replace_defaults.go
+++ b/operations/defaults/replace_defaults.go
@@ -23,7 +23,7 @@ package defaults
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceDefaultsHandlerFunc turns a function with the right signature into a replace defaults handler
diff --git a/operations/defaults/replace_defaults_parameters.go b/operations/defaults/replace_defaults_parameters.go
index 90e5eb99..2955423b 100644
--- a/operations/defaults/replace_defaults_parameters.go
+++ b/operations/defaults/replace_defaults_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceDefaultsParams creates a new ReplaceDefaultsParams object
diff --git a/operations/defaults/replace_defaults_responses.go b/operations/defaults/replace_defaults_responses.go
index 713f1352..45039b2e 100644
--- a/operations/defaults/replace_defaults_responses.go
+++ b/operations/defaults/replace_defaults_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceDefaultsOKCode is the HTTP code returned for type ReplaceDefaultsOK
diff --git a/operations/defaults/replace_defaults_urlbuilder.go b/operations/defaults/replace_defaults_urlbuilder.go
index fea12211..d008a646 100644
--- a/operations/defaults/replace_defaults_urlbuilder.go
+++ b/operations/defaults/replace_defaults_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *ReplaceDefaultsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/discovery/get_api_endpoints.go b/operations/discovery/get_api_endpoints.go
index 819b363c..0851aab9 100644
--- a/operations/discovery/get_api_endpoints.go
+++ b/operations/discovery/get_api_endpoints.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetAPIEndpointsHandlerFunc turns a function with the right signature into a get API endpoints handler
diff --git a/operations/discovery/get_api_endpoints_responses.go b/operations/discovery/get_api_endpoints_responses.go
index ebc040a1..c3e38587 100644
--- a/operations/discovery/get_api_endpoints_responses.go
+++ b/operations/discovery/get_api_endpoints_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetAPIEndpointsOKCode is the HTTP code returned for type GetAPIEndpointsOK
diff --git a/operations/discovery/get_cluster.go b/operations/discovery/get_cluster.go
index 8f25f034..eee42d74 100644
--- a/operations/discovery/get_cluster.go
+++ b/operations/discovery/get_cluster.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetClusterHandlerFunc turns a function with the right signature into a get cluster handler
diff --git a/operations/discovery/get_cluster_responses.go b/operations/discovery/get_cluster_responses.go
index f1033761..57895ee8 100644
--- a/operations/discovery/get_cluster_responses.go
+++ b/operations/discovery/get_cluster_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetClusterOKCode is the HTTP code returned for type GetClusterOK
diff --git a/operations/discovery/get_configuration_endpoints.go b/operations/discovery/get_configuration_endpoints.go
index 4f0658f1..84cdcc22 100644
--- a/operations/discovery/get_configuration_endpoints.go
+++ b/operations/discovery/get_configuration_endpoints.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetConfigurationEndpointsHandlerFunc turns a function with the right signature into a get configuration endpoints handler
diff --git a/operations/discovery/get_configuration_endpoints_responses.go b/operations/discovery/get_configuration_endpoints_responses.go
index a6279aa6..f3e5b73e 100644
--- a/operations/discovery/get_configuration_endpoints_responses.go
+++ b/operations/discovery/get_configuration_endpoints_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetConfigurationEndpointsOKCode is the HTTP code returned for type GetConfigurationEndpointsOK
diff --git a/operations/discovery/get_haproxy_endpoints.go b/operations/discovery/get_haproxy_endpoints.go
index e856aed6..02d2828e 100644
--- a/operations/discovery/get_haproxy_endpoints.go
+++ b/operations/discovery/get_haproxy_endpoints.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetHaproxyEndpointsHandlerFunc turns a function with the right signature into a get haproxy endpoints handler
diff --git a/operations/discovery/get_haproxy_endpoints_responses.go b/operations/discovery/get_haproxy_endpoints_responses.go
index a2e5d956..018820f1 100644
--- a/operations/discovery/get_haproxy_endpoints_responses.go
+++ b/operations/discovery/get_haproxy_endpoints_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHaproxyEndpointsOKCode is the HTTP code returned for type GetHaproxyEndpointsOK
diff --git a/operations/discovery/get_runtime_endpoints.go b/operations/discovery/get_runtime_endpoints.go
index e1748d07..838d7bad 100644
--- a/operations/discovery/get_runtime_endpoints.go
+++ b/operations/discovery/get_runtime_endpoints.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetRuntimeEndpointsHandlerFunc turns a function with the right signature into a get runtime endpoints handler
diff --git a/operations/discovery/get_runtime_endpoints_responses.go b/operations/discovery/get_runtime_endpoints_responses.go
index 91a1721a..9adcf39f 100644
--- a/operations/discovery/get_runtime_endpoints_responses.go
+++ b/operations/discovery/get_runtime_endpoints_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetRuntimeEndpointsOKCode is the HTTP code returned for type GetRuntimeEndpointsOK
diff --git a/operations/discovery/get_services_endpoints.go b/operations/discovery/get_services_endpoints.go
index 967eeb7b..b4c518a7 100644
--- a/operations/discovery/get_services_endpoints.go
+++ b/operations/discovery/get_services_endpoints.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetServicesEndpointsHandlerFunc turns a function with the right signature into a get services endpoints handler
diff --git a/operations/discovery/get_services_endpoints_responses.go b/operations/discovery/get_services_endpoints_responses.go
index 2596c9ab..4db315d9 100644
--- a/operations/discovery/get_services_endpoints_responses.go
+++ b/operations/discovery/get_services_endpoints_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServicesEndpointsOKCode is the HTTP code returned for type GetServicesEndpointsOK
diff --git a/operations/discovery/get_stats_endpoints.go b/operations/discovery/get_stats_endpoints.go
index 2f00e10d..1bcc487e 100644
--- a/operations/discovery/get_stats_endpoints.go
+++ b/operations/discovery/get_stats_endpoints.go
@@ -23,7 +23,7 @@ package discovery
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetStatsEndpointsHandlerFunc turns a function with the right signature into a get stats endpoints handler
diff --git a/operations/discovery/get_stats_endpoints_responses.go b/operations/discovery/get_stats_endpoints_responses.go
index 9d05df8b..0973825a 100644
--- a/operations/discovery/get_stats_endpoints_responses.go
+++ b/operations/discovery/get_stats_endpoints_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStatsEndpointsOKCode is the HTTP code returned for type GetStatsEndpointsOK
diff --git a/operations/filter/create_filter.go b/operations/filter/create_filter.go
index abe0d3f8..bee59670 100644
--- a/operations/filter/create_filter.go
+++ b/operations/filter/create_filter.go
@@ -23,7 +23,7 @@ package filter
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateFilterHandlerFunc turns a function with the right signature into a create filter handler
diff --git a/operations/filter/create_filter_parameters.go b/operations/filter/create_filter_parameters.go
index d937416b..c2f40c7c 100644
--- a/operations/filter/create_filter_parameters.go
+++ b/operations/filter/create_filter_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateFilterParams creates a new CreateFilterParams object
diff --git a/operations/filter/create_filter_responses.go b/operations/filter/create_filter_responses.go
index fb96743c..b171c2c7 100644
--- a/operations/filter/create_filter_responses.go
+++ b/operations/filter/create_filter_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateFilterCreatedCode is the HTTP code returned for type CreateFilterCreated
diff --git a/operations/filter/create_filter_urlbuilder.go b/operations/filter/create_filter_urlbuilder.go
index d38d4a0e..283f0619 100644
--- a/operations/filter/create_filter_urlbuilder.go
+++ b/operations/filter/create_filter_urlbuilder.go
@@ -70,38 +70,38 @@ func (o *CreateFilterURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/filter/delete_filter.go b/operations/filter/delete_filter.go
index 53a5256f..529c2594 100644
--- a/operations/filter/delete_filter.go
+++ b/operations/filter/delete_filter.go
@@ -23,7 +23,7 @@ package filter
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteFilterHandlerFunc turns a function with the right signature into a delete filter handler
diff --git a/operations/filter/delete_filter_parameters.go b/operations/filter/delete_filter_parameters.go
index a073edcb..bdddb258 100644
--- a/operations/filter/delete_filter_parameters.go
+++ b/operations/filter/delete_filter_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteFilterParams creates a new DeleteFilterParams object
diff --git a/operations/filter/delete_filter_responses.go b/operations/filter/delete_filter_responses.go
index 0b9ea2d3..778035cc 100644
--- a/operations/filter/delete_filter_responses.go
+++ b/operations/filter/delete_filter_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteFilterAcceptedCode is the HTTP code returned for type DeleteFilterAccepted
diff --git a/operations/filter/delete_filter_urlbuilder.go b/operations/filter/delete_filter_urlbuilder.go
index 148def49..06e9e2e9 100644
--- a/operations/filter/delete_filter_urlbuilder.go
+++ b/operations/filter/delete_filter_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *DeleteFilterURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/filter/get_filter.go b/operations/filter/get_filter.go
index f22844e9..b6bc7d90 100644
--- a/operations/filter/get_filter.go
+++ b/operations/filter/get_filter.go
@@ -23,12 +23,12 @@ package filter
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFilterHandlerFunc turns a function with the right signature into a get filter handler
@@ -93,6 +93,7 @@ func (o *GetFilter) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetFilterOKBody get filter o k body
+//
 // swagger:model GetFilterOKBody
 type GetFilterOKBody struct {
 
diff --git a/operations/filter/get_filter_parameters.go b/operations/filter/get_filter_parameters.go
index 8f0d7911..8336825f 100644
--- a/operations/filter/get_filter_parameters.go
+++ b/operations/filter/get_filter_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetFilterParams creates a new GetFilterParams object
diff --git a/operations/filter/get_filter_responses.go b/operations/filter/get_filter_responses.go
index 64782d5f..0382ec60 100644
--- a/operations/filter/get_filter_responses.go
+++ b/operations/filter/get_filter_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFilterOKCode is the HTTP code returned for type GetFilterOK
diff --git a/operations/filter/get_filter_urlbuilder.go b/operations/filter/get_filter_urlbuilder.go
index 15668288..942593ea 100644
--- a/operations/filter/get_filter_urlbuilder.go
+++ b/operations/filter/get_filter_urlbuilder.go
@@ -78,22 +78,22 @@ func (o *GetFilterURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/filter/get_filters.go b/operations/filter/get_filters.go
index e56dc130..07bb0883 100644
--- a/operations/filter/get_filters.go
+++ b/operations/filter/get_filters.go
@@ -23,13 +23,13 @@ package filter
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFiltersHandlerFunc turns a function with the right signature into a get filters handler
@@ -94,6 +94,7 @@ func (o *GetFilters) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetFiltersOKBody get filters o k body
+//
 // swagger:model GetFiltersOKBody
 type GetFiltersOKBody struct {
 
diff --git a/operations/filter/get_filters_parameters.go b/operations/filter/get_filters_parameters.go
index ee627e5c..ca91f12c 100644
--- a/operations/filter/get_filters_parameters.go
+++ b/operations/filter/get_filters_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetFiltersParams creates a new GetFiltersParams object
diff --git a/operations/filter/get_filters_responses.go b/operations/filter/get_filters_responses.go
index faf3a2bf..cd15a9c1 100644
--- a/operations/filter/get_filters_responses.go
+++ b/operations/filter/get_filters_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFiltersOKCode is the HTTP code returned for type GetFiltersOK
diff --git a/operations/filter/get_filters_urlbuilder.go b/operations/filter/get_filters_urlbuilder.go
index a2989e7f..5098195c 100644
--- a/operations/filter/get_filters_urlbuilder.go
+++ b/operations/filter/get_filters_urlbuilder.go
@@ -66,22 +66,22 @@ func (o *GetFiltersURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/filter/replace_filter.go b/operations/filter/replace_filter.go
index 64da9412..8f82baef 100644
--- a/operations/filter/replace_filter.go
+++ b/operations/filter/replace_filter.go
@@ -23,7 +23,7 @@ package filter
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceFilterHandlerFunc turns a function with the right signature into a replace filter handler
diff --git a/operations/filter/replace_filter_parameters.go b/operations/filter/replace_filter_parameters.go
index 5c55f31f..10cdb441 100644
--- a/operations/filter/replace_filter_parameters.go
+++ b/operations/filter/replace_filter_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceFilterParams creates a new ReplaceFilterParams object
diff --git a/operations/filter/replace_filter_responses.go b/operations/filter/replace_filter_responses.go
index 3e9748ff..26d0dfdf 100644
--- a/operations/filter/replace_filter_responses.go
+++ b/operations/filter/replace_filter_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceFilterOKCode is the HTTP code returned for type ReplaceFilterOK
diff --git a/operations/filter/replace_filter_urlbuilder.go b/operations/filter/replace_filter_urlbuilder.go
index 90b6cb1e..e6bc8893 100644
--- a/operations/filter/replace_filter_urlbuilder.go
+++ b/operations/filter/replace_filter_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *ReplaceFilterURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/frontend/create_frontend.go b/operations/frontend/create_frontend.go
index f114a535..14652c56 100644
--- a/operations/frontend/create_frontend.go
+++ b/operations/frontend/create_frontend.go
@@ -23,7 +23,7 @@ package frontend
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateFrontendHandlerFunc turns a function with the right signature into a create frontend handler
diff --git a/operations/frontend/create_frontend_parameters.go b/operations/frontend/create_frontend_parameters.go
index 14795309..ba92489d 100644
--- a/operations/frontend/create_frontend_parameters.go
+++ b/operations/frontend/create_frontend_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateFrontendParams creates a new CreateFrontendParams object
diff --git a/operations/frontend/create_frontend_responses.go b/operations/frontend/create_frontend_responses.go
index 17943bed..84fd4929 100644
--- a/operations/frontend/create_frontend_responses.go
+++ b/operations/frontend/create_frontend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateFrontendCreatedCode is the HTTP code returned for type CreateFrontendCreated
diff --git a/operations/frontend/create_frontend_urlbuilder.go b/operations/frontend/create_frontend_urlbuilder.go
index 803d3f08..8a8f0575 100644
--- a/operations/frontend/create_frontend_urlbuilder.go
+++ b/operations/frontend/create_frontend_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *CreateFrontendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/frontend/delete_frontend.go b/operations/frontend/delete_frontend.go
index d1775578..3a8d42aa 100644
--- a/operations/frontend/delete_frontend.go
+++ b/operations/frontend/delete_frontend.go
@@ -23,7 +23,7 @@ package frontend
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteFrontendHandlerFunc turns a function with the right signature into a delete frontend handler
diff --git a/operations/frontend/delete_frontend_parameters.go b/operations/frontend/delete_frontend_parameters.go
index d11dd283..9e47b9a8 100644
--- a/operations/frontend/delete_frontend_parameters.go
+++ b/operations/frontend/delete_frontend_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteFrontendParams creates a new DeleteFrontendParams object
diff --git a/operations/frontend/delete_frontend_responses.go b/operations/frontend/delete_frontend_responses.go
index 671ec582..ef42b58b 100644
--- a/operations/frontend/delete_frontend_responses.go
+++ b/operations/frontend/delete_frontend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteFrontendAcceptedCode is the HTTP code returned for type DeleteFrontendAccepted
diff --git a/operations/frontend/delete_frontend_urlbuilder.go b/operations/frontend/delete_frontend_urlbuilder.go
index 62b0acdd..08b4dea9 100644
--- a/operations/frontend/delete_frontend_urlbuilder.go
+++ b/operations/frontend/delete_frontend_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *DeleteFrontendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/frontend/get_frontend.go b/operations/frontend/get_frontend.go
index 12f48aea..2c6ea66a 100644
--- a/operations/frontend/get_frontend.go
+++ b/operations/frontend/get_frontend.go
@@ -23,12 +23,12 @@ package frontend
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFrontendHandlerFunc turns a function with the right signature into a get frontend handler
@@ -93,6 +93,7 @@ func (o *GetFrontend) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetFrontendOKBody get frontend o k body
+//
 // swagger:model GetFrontendOKBody
 type GetFrontendOKBody struct {
 
diff --git a/operations/frontend/get_frontend_parameters.go b/operations/frontend/get_frontend_parameters.go
index b432e83d..b10eae0d 100644
--- a/operations/frontend/get_frontend_parameters.go
+++ b/operations/frontend/get_frontend_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetFrontendParams creates a new GetFrontendParams object
diff --git a/operations/frontend/get_frontend_responses.go b/operations/frontend/get_frontend_responses.go
index 447b6930..6ca66296 100644
--- a/operations/frontend/get_frontend_responses.go
+++ b/operations/frontend/get_frontend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFrontendOKCode is the HTTP code returned for type GetFrontendOK
diff --git a/operations/frontend/get_frontend_urlbuilder.go b/operations/frontend/get_frontend_urlbuilder.go
index 3b27449c..e7963689 100644
--- a/operations/frontend/get_frontend_urlbuilder.go
+++ b/operations/frontend/get_frontend_urlbuilder.go
@@ -74,12 +74,12 @@ func (o *GetFrontendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/frontend/get_frontends.go b/operations/frontend/get_frontends.go
index 4ee29861..4725ad2e 100644
--- a/operations/frontend/get_frontends.go
+++ b/operations/frontend/get_frontends.go
@@ -23,13 +23,13 @@ package frontend
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFrontendsHandlerFunc turns a function with the right signature into a get frontends handler
@@ -94,6 +94,7 @@ func (o *GetFrontends) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetFrontendsOKBody get frontends o k body
+//
 // swagger:model GetFrontendsOKBody
 type GetFrontendsOKBody struct {
 
diff --git a/operations/frontend/get_frontends_parameters.go b/operations/frontend/get_frontends_parameters.go
index 59ffe4bf..588b34ee 100644
--- a/operations/frontend/get_frontends_parameters.go
+++ b/operations/frontend/get_frontends_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetFrontendsParams creates a new GetFrontendsParams object
diff --git a/operations/frontend/get_frontends_responses.go b/operations/frontend/get_frontends_responses.go
index 1e97ee3e..8b910306 100644
--- a/operations/frontend/get_frontends_responses.go
+++ b/operations/frontend/get_frontends_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetFrontendsOKCode is the HTTP code returned for type GetFrontendsOK
diff --git a/operations/frontend/get_frontends_urlbuilder.go b/operations/frontend/get_frontends_urlbuilder.go
index bed2f84b..96cf45a8 100644
--- a/operations/frontend/get_frontends_urlbuilder.go
+++ b/operations/frontend/get_frontends_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetFrontendsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/frontend/replace_frontend.go b/operations/frontend/replace_frontend.go
index 45e89880..41efaa8b 100644
--- a/operations/frontend/replace_frontend.go
+++ b/operations/frontend/replace_frontend.go
@@ -23,7 +23,7 @@ package frontend
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceFrontendHandlerFunc turns a function with the right signature into a replace frontend handler
diff --git a/operations/frontend/replace_frontend_parameters.go b/operations/frontend/replace_frontend_parameters.go
index d542e24b..ce233ac7 100644
--- a/operations/frontend/replace_frontend_parameters.go
+++ b/operations/frontend/replace_frontend_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceFrontendParams creates a new ReplaceFrontendParams object
diff --git a/operations/frontend/replace_frontend_responses.go b/operations/frontend/replace_frontend_responses.go
index 0ea1e9f6..ee20d8f5 100644
--- a/operations/frontend/replace_frontend_responses.go
+++ b/operations/frontend/replace_frontend_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceFrontendOKCode is the HTTP code returned for type ReplaceFrontendOK
diff --git a/operations/frontend/replace_frontend_urlbuilder.go b/operations/frontend/replace_frontend_urlbuilder.go
index 7356a6c9..ec7caec2 100644
--- a/operations/frontend/replace_frontend_urlbuilder.go
+++ b/operations/frontend/replace_frontend_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *ReplaceFrontendURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/global/get_global.go b/operations/global/get_global.go
index 1f7ab55a..0e082a2a 100644
--- a/operations/global/get_global.go
+++ b/operations/global/get_global.go
@@ -23,12 +23,12 @@ package global
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetGlobalHandlerFunc turns a function with the right signature into a get global handler
@@ -93,6 +93,7 @@ func (o *GetGlobal) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetGlobalOKBody get global o k body
+//
 // swagger:model GetGlobalOKBody
 type GetGlobalOKBody struct {
 
diff --git a/operations/global/get_global_parameters.go b/operations/global/get_global_parameters.go
index 65bbb8c4..b2e99b69 100644
--- a/operations/global/get_global_parameters.go
+++ b/operations/global/get_global_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetGlobalParams creates a new GetGlobalParams object
diff --git a/operations/global/get_global_responses.go b/operations/global/get_global_responses.go
index 8a439f01..d2546ea4 100644
--- a/operations/global/get_global_responses.go
+++ b/operations/global/get_global_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetGlobalOKCode is the HTTP code returned for type GetGlobalOK
diff --git a/operations/global/get_global_urlbuilder.go b/operations/global/get_global_urlbuilder.go
index 66639df1..9784d33c 100644
--- a/operations/global/get_global_urlbuilder.go
+++ b/operations/global/get_global_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetGlobalURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/global/replace_global.go b/operations/global/replace_global.go
index 37b691a4..f5e3a08f 100644
--- a/operations/global/replace_global.go
+++ b/operations/global/replace_global.go
@@ -23,7 +23,7 @@ package global
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceGlobalHandlerFunc turns a function with the right signature into a replace global handler
diff --git a/operations/global/replace_global_parameters.go b/operations/global/replace_global_parameters.go
index acc925d6..1d9cb1f6 100644
--- a/operations/global/replace_global_parameters.go
+++ b/operations/global/replace_global_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceGlobalParams creates a new ReplaceGlobalParams object
diff --git a/operations/global/replace_global_responses.go b/operations/global/replace_global_responses.go
index 6221b03e..6396cbc6 100644
--- a/operations/global/replace_global_responses.go
+++ b/operations/global/replace_global_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceGlobalOKCode is the HTTP code returned for type ReplaceGlobalOK
diff --git a/operations/global/replace_global_urlbuilder.go b/operations/global/replace_global_urlbuilder.go
index bc1cdad4..8b02836a 100644
--- a/operations/global/replace_global_urlbuilder.go
+++ b/operations/global/replace_global_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *ReplaceGlobalURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_request_rule/create_http_request_rule.go b/operations/http_request_rule/create_http_request_rule.go
index 0ba7a70f..3b2f1fc6 100644
--- a/operations/http_request_rule/create_http_request_rule.go
+++ b/operations/http_request_rule/create_http_request_rule.go
@@ -23,7 +23,7 @@ package http_request_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateHTTPRequestRuleHandlerFunc turns a function with the right signature into a create HTTP request rule handler
diff --git a/operations/http_request_rule/create_http_request_rule_parameters.go b/operations/http_request_rule/create_http_request_rule_parameters.go
index 899f389d..bd00bf5a 100644
--- a/operations/http_request_rule/create_http_request_rule_parameters.go
+++ b/operations/http_request_rule/create_http_request_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateHTTPRequestRuleParams creates a new CreateHTTPRequestRuleParams object
diff --git a/operations/http_request_rule/create_http_request_rule_responses.go b/operations/http_request_rule/create_http_request_rule_responses.go
index 68eef61a..b8b196b1 100644
--- a/operations/http_request_rule/create_http_request_rule_responses.go
+++ b/operations/http_request_rule/create_http_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateHTTPRequestRuleCreatedCode is the HTTP code returned for type CreateHTTPRequestRuleCreated
diff --git a/operations/http_request_rule/create_http_request_rule_urlbuilder.go b/operations/http_request_rule/create_http_request_rule_urlbuilder.go
index 89afb058..10fee01f 100644
--- a/operations/http_request_rule/create_http_request_rule_urlbuilder.go
+++ b/operations/http_request_rule/create_http_request_rule_urlbuilder.go
@@ -70,38 +70,38 @@ func (o *CreateHTTPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_request_rule/delete_http_request_rule.go b/operations/http_request_rule/delete_http_request_rule.go
index 384faafa..e63a1059 100644
--- a/operations/http_request_rule/delete_http_request_rule.go
+++ b/operations/http_request_rule/delete_http_request_rule.go
@@ -23,7 +23,7 @@ package http_request_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteHTTPRequestRuleHandlerFunc turns a function with the right signature into a delete HTTP request rule handler
diff --git a/operations/http_request_rule/delete_http_request_rule_parameters.go b/operations/http_request_rule/delete_http_request_rule_parameters.go
index 8fb03c0c..02b43b05 100644
--- a/operations/http_request_rule/delete_http_request_rule_parameters.go
+++ b/operations/http_request_rule/delete_http_request_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteHTTPRequestRuleParams creates a new DeleteHTTPRequestRuleParams object
diff --git a/operations/http_request_rule/delete_http_request_rule_responses.go b/operations/http_request_rule/delete_http_request_rule_responses.go
index 5745ffa6..6467de14 100644
--- a/operations/http_request_rule/delete_http_request_rule_responses.go
+++ b/operations/http_request_rule/delete_http_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteHTTPRequestRuleAcceptedCode is the HTTP code returned for type DeleteHTTPRequestRuleAccepted
diff --git a/operations/http_request_rule/delete_http_request_rule_urlbuilder.go b/operations/http_request_rule/delete_http_request_rule_urlbuilder.go
index 1c7c0f07..248abbc1 100644
--- a/operations/http_request_rule/delete_http_request_rule_urlbuilder.go
+++ b/operations/http_request_rule/delete_http_request_rule_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *DeleteHTTPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_request_rule/get_http_request_rule.go b/operations/http_request_rule/get_http_request_rule.go
index e9ef16e9..b3563272 100644
--- a/operations/http_request_rule/get_http_request_rule.go
+++ b/operations/http_request_rule/get_http_request_rule.go
@@ -23,12 +23,12 @@ package http_request_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPRequestRuleHandlerFunc turns a function with the right signature into a get HTTP request rule handler
@@ -93,6 +93,7 @@ func (o *GetHTTPRequestRule) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 }
 
 // GetHTTPRequestRuleOKBody get HTTP request rule o k body
+//
 // swagger:model GetHTTPRequestRuleOKBody
 type GetHTTPRequestRuleOKBody struct {
 
diff --git a/operations/http_request_rule/get_http_request_rule_parameters.go b/operations/http_request_rule/get_http_request_rule_parameters.go
index 47af1ee9..a79b7683 100644
--- a/operations/http_request_rule/get_http_request_rule_parameters.go
+++ b/operations/http_request_rule/get_http_request_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetHTTPRequestRuleParams creates a new GetHTTPRequestRuleParams object
diff --git a/operations/http_request_rule/get_http_request_rule_responses.go b/operations/http_request_rule/get_http_request_rule_responses.go
index f9f0dc01..070e783f 100644
--- a/operations/http_request_rule/get_http_request_rule_responses.go
+++ b/operations/http_request_rule/get_http_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPRequestRuleOKCode is the HTTP code returned for type GetHTTPRequestRuleOK
diff --git a/operations/http_request_rule/get_http_request_rule_urlbuilder.go b/operations/http_request_rule/get_http_request_rule_urlbuilder.go
index 9f45f21d..88169c8a 100644
--- a/operations/http_request_rule/get_http_request_rule_urlbuilder.go
+++ b/operations/http_request_rule/get_http_request_rule_urlbuilder.go
@@ -78,22 +78,22 @@ func (o *GetHTTPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_request_rule/get_http_request_rules.go b/operations/http_request_rule/get_http_request_rules.go
index e631796a..1b50164c 100644
--- a/operations/http_request_rule/get_http_request_rules.go
+++ b/operations/http_request_rule/get_http_request_rules.go
@@ -23,13 +23,13 @@ package http_request_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPRequestRulesHandlerFunc turns a function with the right signature into a get HTTP request rules handler
@@ -94,6 +94,7 @@ func (o *GetHTTPRequestRules) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 }
 
 // GetHTTPRequestRulesOKBody get HTTP request rules o k body
+//
 // swagger:model GetHTTPRequestRulesOKBody
 type GetHTTPRequestRulesOKBody struct {
 
diff --git a/operations/http_request_rule/get_http_request_rules_parameters.go b/operations/http_request_rule/get_http_request_rules_parameters.go
index 04e82558..23f99102 100644
--- a/operations/http_request_rule/get_http_request_rules_parameters.go
+++ b/operations/http_request_rule/get_http_request_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetHTTPRequestRulesParams creates a new GetHTTPRequestRulesParams object
diff --git a/operations/http_request_rule/get_http_request_rules_responses.go b/operations/http_request_rule/get_http_request_rules_responses.go
index 97aa7ba9..61c2ba84 100644
--- a/operations/http_request_rule/get_http_request_rules_responses.go
+++ b/operations/http_request_rule/get_http_request_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPRequestRulesOKCode is the HTTP code returned for type GetHTTPRequestRulesOK
diff --git a/operations/http_request_rule/get_http_request_rules_urlbuilder.go b/operations/http_request_rule/get_http_request_rules_urlbuilder.go
index 48f6a75b..4645a7e0 100644
--- a/operations/http_request_rule/get_http_request_rules_urlbuilder.go
+++ b/operations/http_request_rule/get_http_request_rules_urlbuilder.go
@@ -66,22 +66,22 @@ func (o *GetHTTPRequestRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_request_rule/replace_http_request_rule.go b/operations/http_request_rule/replace_http_request_rule.go
index 33390c76..9c492941 100644
--- a/operations/http_request_rule/replace_http_request_rule.go
+++ b/operations/http_request_rule/replace_http_request_rule.go
@@ -23,7 +23,7 @@ package http_request_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceHTTPRequestRuleHandlerFunc turns a function with the right signature into a replace HTTP request rule handler
diff --git a/operations/http_request_rule/replace_http_request_rule_parameters.go b/operations/http_request_rule/replace_http_request_rule_parameters.go
index aa80c203..c4ef15bb 100644
--- a/operations/http_request_rule/replace_http_request_rule_parameters.go
+++ b/operations/http_request_rule/replace_http_request_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceHTTPRequestRuleParams creates a new ReplaceHTTPRequestRuleParams object
diff --git a/operations/http_request_rule/replace_http_request_rule_responses.go b/operations/http_request_rule/replace_http_request_rule_responses.go
index d48231a5..781c0b8a 100644
--- a/operations/http_request_rule/replace_http_request_rule_responses.go
+++ b/operations/http_request_rule/replace_http_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceHTTPRequestRuleOKCode is the HTTP code returned for type ReplaceHTTPRequestRuleOK
diff --git a/operations/http_request_rule/replace_http_request_rule_urlbuilder.go b/operations/http_request_rule/replace_http_request_rule_urlbuilder.go
index f7541566..b02599fc 100644
--- a/operations/http_request_rule/replace_http_request_rule_urlbuilder.go
+++ b/operations/http_request_rule/replace_http_request_rule_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *ReplaceHTTPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_response_rule/create_http_response_rule.go b/operations/http_response_rule/create_http_response_rule.go
index 0878e0d9..118595bd 100644
--- a/operations/http_response_rule/create_http_response_rule.go
+++ b/operations/http_response_rule/create_http_response_rule.go
@@ -23,7 +23,7 @@ package http_response_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateHTTPResponseRuleHandlerFunc turns a function with the right signature into a create HTTP response rule handler
diff --git a/operations/http_response_rule/create_http_response_rule_parameters.go b/operations/http_response_rule/create_http_response_rule_parameters.go
index d9054696..a4da8344 100644
--- a/operations/http_response_rule/create_http_response_rule_parameters.go
+++ b/operations/http_response_rule/create_http_response_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateHTTPResponseRuleParams creates a new CreateHTTPResponseRuleParams object
diff --git a/operations/http_response_rule/create_http_response_rule_responses.go b/operations/http_response_rule/create_http_response_rule_responses.go
index 7c8b8589..9595bf37 100644
--- a/operations/http_response_rule/create_http_response_rule_responses.go
+++ b/operations/http_response_rule/create_http_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateHTTPResponseRuleCreatedCode is the HTTP code returned for type CreateHTTPResponseRuleCreated
diff --git a/operations/http_response_rule/create_http_response_rule_urlbuilder.go b/operations/http_response_rule/create_http_response_rule_urlbuilder.go
index 5a44ec92..49bde13f 100644
--- a/operations/http_response_rule/create_http_response_rule_urlbuilder.go
+++ b/operations/http_response_rule/create_http_response_rule_urlbuilder.go
@@ -70,38 +70,38 @@ func (o *CreateHTTPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_response_rule/delete_http_response_rule.go b/operations/http_response_rule/delete_http_response_rule.go
index e051763d..2b46b906 100644
--- a/operations/http_response_rule/delete_http_response_rule.go
+++ b/operations/http_response_rule/delete_http_response_rule.go
@@ -23,7 +23,7 @@ package http_response_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteHTTPResponseRuleHandlerFunc turns a function with the right signature into a delete HTTP response rule handler
diff --git a/operations/http_response_rule/delete_http_response_rule_parameters.go b/operations/http_response_rule/delete_http_response_rule_parameters.go
index 541a9563..91663e52 100644
--- a/operations/http_response_rule/delete_http_response_rule_parameters.go
+++ b/operations/http_response_rule/delete_http_response_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteHTTPResponseRuleParams creates a new DeleteHTTPResponseRuleParams object
diff --git a/operations/http_response_rule/delete_http_response_rule_responses.go b/operations/http_response_rule/delete_http_response_rule_responses.go
index 6a5ae7ce..1f23b956 100644
--- a/operations/http_response_rule/delete_http_response_rule_responses.go
+++ b/operations/http_response_rule/delete_http_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteHTTPResponseRuleAcceptedCode is the HTTP code returned for type DeleteHTTPResponseRuleAccepted
diff --git a/operations/http_response_rule/delete_http_response_rule_urlbuilder.go b/operations/http_response_rule/delete_http_response_rule_urlbuilder.go
index 6dc9b5fe..6c83a802 100644
--- a/operations/http_response_rule/delete_http_response_rule_urlbuilder.go
+++ b/operations/http_response_rule/delete_http_response_rule_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *DeleteHTTPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_response_rule/get_http_response_rule.go b/operations/http_response_rule/get_http_response_rule.go
index 31e01658..043b7919 100644
--- a/operations/http_response_rule/get_http_response_rule.go
+++ b/operations/http_response_rule/get_http_response_rule.go
@@ -23,12 +23,12 @@ package http_response_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPResponseRuleHandlerFunc turns a function with the right signature into a get HTTP response rule handler
@@ -93,6 +93,7 @@ func (o *GetHTTPResponseRule) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 }
 
 // GetHTTPResponseRuleOKBody get HTTP response rule o k body
+//
 // swagger:model GetHTTPResponseRuleOKBody
 type GetHTTPResponseRuleOKBody struct {
 
diff --git a/operations/http_response_rule/get_http_response_rule_parameters.go b/operations/http_response_rule/get_http_response_rule_parameters.go
index da05fdab..bd87f150 100644
--- a/operations/http_response_rule/get_http_response_rule_parameters.go
+++ b/operations/http_response_rule/get_http_response_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetHTTPResponseRuleParams creates a new GetHTTPResponseRuleParams object
diff --git a/operations/http_response_rule/get_http_response_rule_responses.go b/operations/http_response_rule/get_http_response_rule_responses.go
index 9f94c0f7..0edaf7ae 100644
--- a/operations/http_response_rule/get_http_response_rule_responses.go
+++ b/operations/http_response_rule/get_http_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPResponseRuleOKCode is the HTTP code returned for type GetHTTPResponseRuleOK
diff --git a/operations/http_response_rule/get_http_response_rule_urlbuilder.go b/operations/http_response_rule/get_http_response_rule_urlbuilder.go
index 023224c5..44823944 100644
--- a/operations/http_response_rule/get_http_response_rule_urlbuilder.go
+++ b/operations/http_response_rule/get_http_response_rule_urlbuilder.go
@@ -78,22 +78,22 @@ func (o *GetHTTPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_response_rule/get_http_response_rules.go b/operations/http_response_rule/get_http_response_rules.go
index ff2fabc3..09c1a8b0 100644
--- a/operations/http_response_rule/get_http_response_rules.go
+++ b/operations/http_response_rule/get_http_response_rules.go
@@ -23,13 +23,13 @@ package http_response_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPResponseRulesHandlerFunc turns a function with the right signature into a get HTTP response rules handler
@@ -94,6 +94,7 @@ func (o *GetHTTPResponseRules) ServeHTTP(rw http.ResponseWriter, r *http.Request
 }
 
 // GetHTTPResponseRulesOKBody get HTTP response rules o k body
+//
 // swagger:model GetHTTPResponseRulesOKBody
 type GetHTTPResponseRulesOKBody struct {
 
diff --git a/operations/http_response_rule/get_http_response_rules_parameters.go b/operations/http_response_rule/get_http_response_rules_parameters.go
index 5a3bb9c0..14754586 100644
--- a/operations/http_response_rule/get_http_response_rules_parameters.go
+++ b/operations/http_response_rule/get_http_response_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetHTTPResponseRulesParams creates a new GetHTTPResponseRulesParams object
diff --git a/operations/http_response_rule/get_http_response_rules_responses.go b/operations/http_response_rule/get_http_response_rules_responses.go
index fad78e43..08e9fc4a 100644
--- a/operations/http_response_rule/get_http_response_rules_responses.go
+++ b/operations/http_response_rule/get_http_response_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHTTPResponseRulesOKCode is the HTTP code returned for type GetHTTPResponseRulesOK
diff --git a/operations/http_response_rule/get_http_response_rules_urlbuilder.go b/operations/http_response_rule/get_http_response_rules_urlbuilder.go
index 7c7cc592..e2d9c8ab 100644
--- a/operations/http_response_rule/get_http_response_rules_urlbuilder.go
+++ b/operations/http_response_rule/get_http_response_rules_urlbuilder.go
@@ -66,22 +66,22 @@ func (o *GetHTTPResponseRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/http_response_rule/replace_http_response_rule.go b/operations/http_response_rule/replace_http_response_rule.go
index ac5c8d46..8d616ce6 100644
--- a/operations/http_response_rule/replace_http_response_rule.go
+++ b/operations/http_response_rule/replace_http_response_rule.go
@@ -23,7 +23,7 @@ package http_response_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceHTTPResponseRuleHandlerFunc turns a function with the right signature into a replace HTTP response rule handler
diff --git a/operations/http_response_rule/replace_http_response_rule_parameters.go b/operations/http_response_rule/replace_http_response_rule_parameters.go
index 57b7703b..da866b69 100644
--- a/operations/http_response_rule/replace_http_response_rule_parameters.go
+++ b/operations/http_response_rule/replace_http_response_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceHTTPResponseRuleParams creates a new ReplaceHTTPResponseRuleParams object
diff --git a/operations/http_response_rule/replace_http_response_rule_responses.go b/operations/http_response_rule/replace_http_response_rule_responses.go
index 1bd2ec1c..f469f3ba 100644
--- a/operations/http_response_rule/replace_http_response_rule_responses.go
+++ b/operations/http_response_rule/replace_http_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceHTTPResponseRuleOKCode is the HTTP code returned for type ReplaceHTTPResponseRuleOK
diff --git a/operations/http_response_rule/replace_http_response_rule_urlbuilder.go b/operations/http_response_rule/replace_http_response_rule_urlbuilder.go
index 58ab1fcc..6b9675d2 100644
--- a/operations/http_response_rule/replace_http_response_rule_urlbuilder.go
+++ b/operations/http_response_rule/replace_http_response_rule_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *ReplaceHTTPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/information/get_haproxy_process_info.go b/operations/information/get_haproxy_process_info.go
index 2de4d025..e342f5c9 100644
--- a/operations/information/get_haproxy_process_info.go
+++ b/operations/information/get_haproxy_process_info.go
@@ -23,7 +23,7 @@ package information
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetHaproxyProcessInfoHandlerFunc turns a function with the right signature into a get haproxy process info handler
diff --git a/operations/information/get_haproxy_process_info_responses.go b/operations/information/get_haproxy_process_info_responses.go
index 4e5f3bd8..abcb86fe 100644
--- a/operations/information/get_haproxy_process_info_responses.go
+++ b/operations/information/get_haproxy_process_info_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetHaproxyProcessInfoOKCode is the HTTP code returned for type GetHaproxyProcessInfoOK
diff --git a/operations/information/get_info.go b/operations/information/get_info.go
index 54bb3ad4..a196c5af 100644
--- a/operations/information/get_info.go
+++ b/operations/information/get_info.go
@@ -23,7 +23,7 @@ package information
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetInfoHandlerFunc turns a function with the right signature into a get info handler
diff --git a/operations/information/get_info_responses.go b/operations/information/get_info_responses.go
index 8c034a27..022177bb 100644
--- a/operations/information/get_info_responses.go
+++ b/operations/information/get_info_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetInfoOKCode is the HTTP code returned for type GetInfoOK
diff --git a/operations/log_target/create_log_target.go b/operations/log_target/create_log_target.go
index 9d8c72f8..cecb4f1f 100644
--- a/operations/log_target/create_log_target.go
+++ b/operations/log_target/create_log_target.go
@@ -23,7 +23,7 @@ package log_target
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateLogTargetHandlerFunc turns a function with the right signature into a create log target handler
diff --git a/operations/log_target/create_log_target_parameters.go b/operations/log_target/create_log_target_parameters.go
index 2ffbe998..f2fbb0a8 100644
--- a/operations/log_target/create_log_target_parameters.go
+++ b/operations/log_target/create_log_target_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateLogTargetParams creates a new CreateLogTargetParams object
diff --git a/operations/log_target/create_log_target_responses.go b/operations/log_target/create_log_target_responses.go
index bee6b877..8b8580c9 100644
--- a/operations/log_target/create_log_target_responses.go
+++ b/operations/log_target/create_log_target_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateLogTargetCreatedCode is the HTTP code returned for type CreateLogTargetCreated
diff --git a/operations/log_target/create_log_target_urlbuilder.go b/operations/log_target/create_log_target_urlbuilder.go
index 0e316db5..93e11cd3 100644
--- a/operations/log_target/create_log_target_urlbuilder.go
+++ b/operations/log_target/create_log_target_urlbuilder.go
@@ -70,38 +70,38 @@ func (o *CreateLogTargetURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/log_target/delete_log_target.go b/operations/log_target/delete_log_target.go
index 6311f40d..efc8aef7 100644
--- a/operations/log_target/delete_log_target.go
+++ b/operations/log_target/delete_log_target.go
@@ -23,7 +23,7 @@ package log_target
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteLogTargetHandlerFunc turns a function with the right signature into a delete log target handler
diff --git a/operations/log_target/delete_log_target_parameters.go b/operations/log_target/delete_log_target_parameters.go
index 2a34d6a1..356c23c7 100644
--- a/operations/log_target/delete_log_target_parameters.go
+++ b/operations/log_target/delete_log_target_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteLogTargetParams creates a new DeleteLogTargetParams object
diff --git a/operations/log_target/delete_log_target_responses.go b/operations/log_target/delete_log_target_responses.go
index 00cb532f..7be7bbaf 100644
--- a/operations/log_target/delete_log_target_responses.go
+++ b/operations/log_target/delete_log_target_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteLogTargetAcceptedCode is the HTTP code returned for type DeleteLogTargetAccepted
diff --git a/operations/log_target/delete_log_target_urlbuilder.go b/operations/log_target/delete_log_target_urlbuilder.go
index 6d2d8a3a..2ac1de72 100644
--- a/operations/log_target/delete_log_target_urlbuilder.go
+++ b/operations/log_target/delete_log_target_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *DeleteLogTargetURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/log_target/get_log_target.go b/operations/log_target/get_log_target.go
index 40bf62d3..ef13da67 100644
--- a/operations/log_target/get_log_target.go
+++ b/operations/log_target/get_log_target.go
@@ -23,12 +23,12 @@ package log_target
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetLogTargetHandlerFunc turns a function with the right signature into a get log target handler
@@ -93,6 +93,7 @@ func (o *GetLogTarget) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetLogTargetOKBody get log target o k body
+//
 // swagger:model GetLogTargetOKBody
 type GetLogTargetOKBody struct {
 
diff --git a/operations/log_target/get_log_target_parameters.go b/operations/log_target/get_log_target_parameters.go
index f3c8ccac..2bd4880b 100644
--- a/operations/log_target/get_log_target_parameters.go
+++ b/operations/log_target/get_log_target_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetLogTargetParams creates a new GetLogTargetParams object
diff --git a/operations/log_target/get_log_target_responses.go b/operations/log_target/get_log_target_responses.go
index bfbaa141..9a2e0224 100644
--- a/operations/log_target/get_log_target_responses.go
+++ b/operations/log_target/get_log_target_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetLogTargetOKCode is the HTTP code returned for type GetLogTargetOK
diff --git a/operations/log_target/get_log_target_urlbuilder.go b/operations/log_target/get_log_target_urlbuilder.go
index 84dcbcf0..05b12745 100644
--- a/operations/log_target/get_log_target_urlbuilder.go
+++ b/operations/log_target/get_log_target_urlbuilder.go
@@ -78,22 +78,22 @@ func (o *GetLogTargetURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/log_target/get_log_targets.go b/operations/log_target/get_log_targets.go
index 3c56c730..3fee9df0 100644
--- a/operations/log_target/get_log_targets.go
+++ b/operations/log_target/get_log_targets.go
@@ -23,13 +23,13 @@ package log_target
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetLogTargetsHandlerFunc turns a function with the right signature into a get log targets handler
@@ -94,6 +94,7 @@ func (o *GetLogTargets) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetLogTargetsOKBody get log targets o k body
+//
 // swagger:model GetLogTargetsOKBody
 type GetLogTargetsOKBody struct {
 
diff --git a/operations/log_target/get_log_targets_parameters.go b/operations/log_target/get_log_targets_parameters.go
index bbd14580..9712bd69 100644
--- a/operations/log_target/get_log_targets_parameters.go
+++ b/operations/log_target/get_log_targets_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetLogTargetsParams creates a new GetLogTargetsParams object
diff --git a/operations/log_target/get_log_targets_responses.go b/operations/log_target/get_log_targets_responses.go
index 910cd451..8ea2daf7 100644
--- a/operations/log_target/get_log_targets_responses.go
+++ b/operations/log_target/get_log_targets_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetLogTargetsOKCode is the HTTP code returned for type GetLogTargetsOK
diff --git a/operations/log_target/get_log_targets_urlbuilder.go b/operations/log_target/get_log_targets_urlbuilder.go
index f590fda0..6e59ca34 100644
--- a/operations/log_target/get_log_targets_urlbuilder.go
+++ b/operations/log_target/get_log_targets_urlbuilder.go
@@ -66,22 +66,22 @@ func (o *GetLogTargetsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/log_target/replace_log_target.go b/operations/log_target/replace_log_target.go
index 90f19fe0..12ea8c76 100644
--- a/operations/log_target/replace_log_target.go
+++ b/operations/log_target/replace_log_target.go
@@ -23,7 +23,7 @@ package log_target
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceLogTargetHandlerFunc turns a function with the right signature into a replace log target handler
diff --git a/operations/log_target/replace_log_target_parameters.go b/operations/log_target/replace_log_target_parameters.go
index 57bda8e5..2ab67ae2 100644
--- a/operations/log_target/replace_log_target_parameters.go
+++ b/operations/log_target/replace_log_target_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceLogTargetParams creates a new ReplaceLogTargetParams object
diff --git a/operations/log_target/replace_log_target_responses.go b/operations/log_target/replace_log_target_responses.go
index 2a99cd2e..ae1c3d27 100644
--- a/operations/log_target/replace_log_target_responses.go
+++ b/operations/log_target/replace_log_target_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceLogTargetOKCode is the HTTP code returned for type ReplaceLogTargetOK
diff --git a/operations/log_target/replace_log_target_urlbuilder.go b/operations/log_target/replace_log_target_urlbuilder.go
index ff1654c1..854b0a31 100644
--- a/operations/log_target/replace_log_target_urlbuilder.go
+++ b/operations/log_target/replace_log_target_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *ReplaceLogTargetURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/maps/add_map_entry.go b/operations/maps/add_map_entry.go
index 922fd8c7..250f6efb 100644
--- a/operations/maps/add_map_entry.go
+++ b/operations/maps/add_map_entry.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // AddMapEntryHandlerFunc turns a function with the right signature into a add map entry handler
diff --git a/operations/maps/add_map_entry_parameters.go b/operations/maps/add_map_entry_parameters.go
index dc4e8a5e..17f8d174 100644
--- a/operations/maps/add_map_entry_parameters.go
+++ b/operations/maps/add_map_entry_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewAddMapEntryParams creates a new AddMapEntryParams object
diff --git a/operations/maps/add_map_entry_responses.go b/operations/maps/add_map_entry_responses.go
index 76ade98d..5b53887e 100644
--- a/operations/maps/add_map_entry_responses.go
+++ b/operations/maps/add_map_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // AddMapEntryCreatedCode is the HTTP code returned for type AddMapEntryCreated
diff --git a/operations/maps/add_map_entry_urlbuilder.go b/operations/maps/add_map_entry_urlbuilder.go
index c1049702..9bb41f65 100644
--- a/operations/maps/add_map_entry_urlbuilder.go
+++ b/operations/maps/add_map_entry_urlbuilder.go
@@ -64,9 +64,9 @@ func (o *AddMapEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	mapVar := o.Map
-	if mapVar != "" {
-		qs.Set("map", mapVar)
+	mapVarQ := o.Map
+	if mapVarQ != "" {
+		qs.Set("map", mapVarQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/maps/clear_runtime_map.go b/operations/maps/clear_runtime_map.go
index d5b7676e..f8566e93 100644
--- a/operations/maps/clear_runtime_map.go
+++ b/operations/maps/clear_runtime_map.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ClearRuntimeMapHandlerFunc turns a function with the right signature into a clear runtime map handler
diff --git a/operations/maps/clear_runtime_map_parameters.go b/operations/maps/clear_runtime_map_parameters.go
index 5c4ab322..5969806a 100644
--- a/operations/maps/clear_runtime_map_parameters.go
+++ b/operations/maps/clear_runtime_map_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewClearRuntimeMapParams creates a new ClearRuntimeMapParams object
diff --git a/operations/maps/clear_runtime_map_responses.go b/operations/maps/clear_runtime_map_responses.go
index 54fb0b20..4ebd190b 100644
--- a/operations/maps/clear_runtime_map_responses.go
+++ b/operations/maps/clear_runtime_map_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ClearRuntimeMapNoContentCode is the HTTP code returned for type ClearRuntimeMapNoContent
diff --git a/operations/maps/clear_runtime_map_urlbuilder.go b/operations/maps/clear_runtime_map_urlbuilder.go
index 97458d07..c9e03e25 100644
--- a/operations/maps/clear_runtime_map_urlbuilder.go
+++ b/operations/maps/clear_runtime_map_urlbuilder.go
@@ -76,12 +76,12 @@ func (o *ClearRuntimeMapURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceDelete string
+	var forceDeleteQ string
 	if o.ForceDelete != nil {
-		forceDelete = swag.FormatBool(*o.ForceDelete)
+		forceDeleteQ = swag.FormatBool(*o.ForceDelete)
 	}
-	if forceDelete != "" {
-		qs.Set("forceDelete", forceDelete)
+	if forceDeleteQ != "" {
+		qs.Set("forceDelete", forceDeleteQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/maps/create_runtime_map.go b/operations/maps/create_runtime_map.go
index 41e24a09..41549459 100644
--- a/operations/maps/create_runtime_map.go
+++ b/operations/maps/create_runtime_map.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateRuntimeMapHandlerFunc turns a function with the right signature into a create runtime map handler
diff --git a/operations/maps/create_runtime_map_responses.go b/operations/maps/create_runtime_map_responses.go
index 4f11f4e3..49b78a41 100644
--- a/operations/maps/create_runtime_map_responses.go
+++ b/operations/maps/create_runtime_map_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateRuntimeMapCreatedCode is the HTTP code returned for type CreateRuntimeMapCreated
diff --git a/operations/maps/delete_runtime_map_entry.go b/operations/maps/delete_runtime_map_entry.go
index 229dd1c2..7342a8b6 100644
--- a/operations/maps/delete_runtime_map_entry.go
+++ b/operations/maps/delete_runtime_map_entry.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteRuntimeMapEntryHandlerFunc turns a function with the right signature into a delete runtime map entry handler
diff --git a/operations/maps/delete_runtime_map_entry_parameters.go b/operations/maps/delete_runtime_map_entry_parameters.go
index 3af5b2c7..36031b76 100644
--- a/operations/maps/delete_runtime_map_entry_parameters.go
+++ b/operations/maps/delete_runtime_map_entry_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteRuntimeMapEntryParams creates a new DeleteRuntimeMapEntryParams object
diff --git a/operations/maps/delete_runtime_map_entry_responses.go b/operations/maps/delete_runtime_map_entry_responses.go
index f26cd9bf..af1c003f 100644
--- a/operations/maps/delete_runtime_map_entry_responses.go
+++ b/operations/maps/delete_runtime_map_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteRuntimeMapEntryNoContentCode is the HTTP code returned for type DeleteRuntimeMapEntryNoContent
diff --git a/operations/maps/delete_runtime_map_entry_urlbuilder.go b/operations/maps/delete_runtime_map_entry_urlbuilder.go
index 8454aa5c..ada53ff7 100644
--- a/operations/maps/delete_runtime_map_entry_urlbuilder.go
+++ b/operations/maps/delete_runtime_map_entry_urlbuilder.go
@@ -74,9 +74,9 @@ func (o *DeleteRuntimeMapEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	mapVar := o.Map
-	if mapVar != "" {
-		qs.Set("map", mapVar)
+	mapVarQ := o.Map
+	if mapVarQ != "" {
+		qs.Set("map", mapVarQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/maps/get_all_runtime_map_files.go b/operations/maps/get_all_runtime_map_files.go
index 9412c901..475da2fa 100644
--- a/operations/maps/get_all_runtime_map_files.go
+++ b/operations/maps/get_all_runtime_map_files.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetAllRuntimeMapFilesHandlerFunc turns a function with the right signature into a get all runtime map files handler
diff --git a/operations/maps/get_all_runtime_map_files_responses.go b/operations/maps/get_all_runtime_map_files_responses.go
index c9e6ebf8..a91e9023 100644
--- a/operations/maps/get_all_runtime_map_files_responses.go
+++ b/operations/maps/get_all_runtime_map_files_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetAllRuntimeMapFilesOKCode is the HTTP code returned for type GetAllRuntimeMapFilesOK
diff --git a/operations/maps/get_one_runtime_map.go b/operations/maps/get_one_runtime_map.go
index 00f89a17..cf289323 100644
--- a/operations/maps/get_one_runtime_map.go
+++ b/operations/maps/get_one_runtime_map.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetOneRuntimeMapHandlerFunc turns a function with the right signature into a get one runtime map handler
diff --git a/operations/maps/get_one_runtime_map_parameters.go b/operations/maps/get_one_runtime_map_parameters.go
index cb250d79..582735ad 100644
--- a/operations/maps/get_one_runtime_map_parameters.go
+++ b/operations/maps/get_one_runtime_map_parameters.go
@@ -25,8 +25,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetOneRuntimeMapParams creates a new GetOneRuntimeMapParams object
diff --git a/operations/maps/get_one_runtime_map_responses.go b/operations/maps/get_one_runtime_map_responses.go
index 9dede137..10c77516 100644
--- a/operations/maps/get_one_runtime_map_responses.go
+++ b/operations/maps/get_one_runtime_map_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetOneRuntimeMapOKCode is the HTTP code returned for type GetOneRuntimeMapOK
diff --git a/operations/maps/get_runtime_map_entry.go b/operations/maps/get_runtime_map_entry.go
index f94556c4..b857fa37 100644
--- a/operations/maps/get_runtime_map_entry.go
+++ b/operations/maps/get_runtime_map_entry.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetRuntimeMapEntryHandlerFunc turns a function with the right signature into a get runtime map entry handler
diff --git a/operations/maps/get_runtime_map_entry_parameters.go b/operations/maps/get_runtime_map_entry_parameters.go
index ed101060..ebeec60c 100644
--- a/operations/maps/get_runtime_map_entry_parameters.go
+++ b/operations/maps/get_runtime_map_entry_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetRuntimeMapEntryParams creates a new GetRuntimeMapEntryParams object
diff --git a/operations/maps/get_runtime_map_entry_responses.go b/operations/maps/get_runtime_map_entry_responses.go
index f8075598..35b9da88 100644
--- a/operations/maps/get_runtime_map_entry_responses.go
+++ b/operations/maps/get_runtime_map_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetRuntimeMapEntryOKCode is the HTTP code returned for type GetRuntimeMapEntryOK
diff --git a/operations/maps/get_runtime_map_entry_urlbuilder.go b/operations/maps/get_runtime_map_entry_urlbuilder.go
index f54b713d..d7e0b9f3 100644
--- a/operations/maps/get_runtime_map_entry_urlbuilder.go
+++ b/operations/maps/get_runtime_map_entry_urlbuilder.go
@@ -74,9 +74,9 @@ func (o *GetRuntimeMapEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	mapVar := o.Map
-	if mapVar != "" {
-		qs.Set("map", mapVar)
+	mapVarQ := o.Map
+	if mapVarQ != "" {
+		qs.Set("map", mapVarQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/maps/replace_runtime_map_entry.go b/operations/maps/replace_runtime_map_entry.go
index 3539fa21..23397b0d 100644
--- a/operations/maps/replace_runtime_map_entry.go
+++ b/operations/maps/replace_runtime_map_entry.go
@@ -23,11 +23,11 @@ package maps
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 )
 
 // ReplaceRuntimeMapEntryHandlerFunc turns a function with the right signature into a replace runtime map entry handler
@@ -92,6 +92,7 @@ func (o *ReplaceRuntimeMapEntry) ServeHTTP(rw http.ResponseWriter, r *http.Reque
 }
 
 // ReplaceRuntimeMapEntryBody replace runtime map entry body
+//
 // swagger:model ReplaceRuntimeMapEntryBody
 type ReplaceRuntimeMapEntryBody struct {
 
diff --git a/operations/maps/replace_runtime_map_entry_parameters.go b/operations/maps/replace_runtime_map_entry_parameters.go
index f08f4aac..edc5ab29 100644
--- a/operations/maps/replace_runtime_map_entry_parameters.go
+++ b/operations/maps/replace_runtime_map_entry_parameters.go
@@ -27,9 +27,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewReplaceRuntimeMapEntryParams creates a new ReplaceRuntimeMapEntryParams object
diff --git a/operations/maps/replace_runtime_map_entry_responses.go b/operations/maps/replace_runtime_map_entry_responses.go
index d921428a..6df8736d 100644
--- a/operations/maps/replace_runtime_map_entry_responses.go
+++ b/operations/maps/replace_runtime_map_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceRuntimeMapEntryOKCode is the HTTP code returned for type ReplaceRuntimeMapEntryOK
diff --git a/operations/maps/replace_runtime_map_entry_urlbuilder.go b/operations/maps/replace_runtime_map_entry_urlbuilder.go
index 1268d743..3a8833be 100644
--- a/operations/maps/replace_runtime_map_entry_urlbuilder.go
+++ b/operations/maps/replace_runtime_map_entry_urlbuilder.go
@@ -74,9 +74,9 @@ func (o *ReplaceRuntimeMapEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	mapVar := o.Map
-	if mapVar != "" {
-		qs.Set("map", mapVar)
+	mapVarQ := o.Map
+	if mapVarQ != "" {
+		qs.Set("map", mapVarQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/maps/show_runtime_map.go b/operations/maps/show_runtime_map.go
index 6ab84ac4..439120d0 100644
--- a/operations/maps/show_runtime_map.go
+++ b/operations/maps/show_runtime_map.go
@@ -23,7 +23,7 @@ package maps
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ShowRuntimeMapHandlerFunc turns a function with the right signature into a show runtime map handler
diff --git a/operations/maps/show_runtime_map_parameters.go b/operations/maps/show_runtime_map_parameters.go
index e808fed8..339cd39e 100644
--- a/operations/maps/show_runtime_map_parameters.go
+++ b/operations/maps/show_runtime_map_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewShowRuntimeMapParams creates a new ShowRuntimeMapParams object
diff --git a/operations/maps/show_runtime_map_responses.go b/operations/maps/show_runtime_map_responses.go
index 109e53a4..8edd90f3 100644
--- a/operations/maps/show_runtime_map_responses.go
+++ b/operations/maps/show_runtime_map_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ShowRuntimeMapOKCode is the HTTP code returned for type ShowRuntimeMapOK
diff --git a/operations/maps/show_runtime_map_urlbuilder.go b/operations/maps/show_runtime_map_urlbuilder.go
index a430ef4f..7ed81b1f 100644
--- a/operations/maps/show_runtime_map_urlbuilder.go
+++ b/operations/maps/show_runtime_map_urlbuilder.go
@@ -64,9 +64,9 @@ func (o *ShowRuntimeMapURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	mapVar := o.Map
-	if mapVar != "" {
-		qs.Set("map", mapVar)
+	mapVarQ := o.Map
+	if mapVarQ != "" {
+		qs.Set("map", mapVarQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/nameserver/create_nameserver.go b/operations/nameserver/create_nameserver.go
index 2239d28a..7c623a0d 100644
--- a/operations/nameserver/create_nameserver.go
+++ b/operations/nameserver/create_nameserver.go
@@ -23,7 +23,7 @@ package nameserver
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateNameserverHandlerFunc turns a function with the right signature into a create nameserver handler
diff --git a/operations/nameserver/create_nameserver_parameters.go b/operations/nameserver/create_nameserver_parameters.go
index 23257360..c813f2c9 100644
--- a/operations/nameserver/create_nameserver_parameters.go
+++ b/operations/nameserver/create_nameserver_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateNameserverParams creates a new CreateNameserverParams object
diff --git a/operations/nameserver/create_nameserver_responses.go b/operations/nameserver/create_nameserver_responses.go
index 2ba9535e..6842d7d5 100644
--- a/operations/nameserver/create_nameserver_responses.go
+++ b/operations/nameserver/create_nameserver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateNameserverCreatedCode is the HTTP code returned for type CreateNameserverCreated
diff --git a/operations/nameserver/create_nameserver_urlbuilder.go b/operations/nameserver/create_nameserver_urlbuilder.go
index 0e0e4dfe..9063481e 100644
--- a/operations/nameserver/create_nameserver_urlbuilder.go
+++ b/operations/nameserver/create_nameserver_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateNameserverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	resolver := o.Resolver
-	if resolver != "" {
-		qs.Set("resolver", resolver)
+	resolverQ := o.Resolver
+	if resolverQ != "" {
+		qs.Set("resolver", resolverQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/nameserver/delete_nameserver.go b/operations/nameserver/delete_nameserver.go
index 4c18cb61..a289f168 100644
--- a/operations/nameserver/delete_nameserver.go
+++ b/operations/nameserver/delete_nameserver.go
@@ -23,7 +23,7 @@ package nameserver
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteNameserverHandlerFunc turns a function with the right signature into a delete nameserver handler
diff --git a/operations/nameserver/delete_nameserver_parameters.go b/operations/nameserver/delete_nameserver_parameters.go
index c2994f01..e1b1e918 100644
--- a/operations/nameserver/delete_nameserver_parameters.go
+++ b/operations/nameserver/delete_nameserver_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteNameserverParams creates a new DeleteNameserverParams object
diff --git a/operations/nameserver/delete_nameserver_responses.go b/operations/nameserver/delete_nameserver_responses.go
index 9ff4a3c9..12c3bf5c 100644
--- a/operations/nameserver/delete_nameserver_responses.go
+++ b/operations/nameserver/delete_nameserver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteNameserverAcceptedCode is the HTTP code returned for type DeleteNameserverAccepted
diff --git a/operations/nameserver/delete_nameserver_urlbuilder.go b/operations/nameserver/delete_nameserver_urlbuilder.go
index 38932091..e12583f4 100644
--- a/operations/nameserver/delete_nameserver_urlbuilder.go
+++ b/operations/nameserver/delete_nameserver_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteNameserverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	resolver := o.Resolver
-	if resolver != "" {
-		qs.Set("resolver", resolver)
+	resolverQ := o.Resolver
+	if resolverQ != "" {
+		qs.Set("resolver", resolverQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/nameserver/get_nameserver.go b/operations/nameserver/get_nameserver.go
index aad47b3d..b503c38c 100644
--- a/operations/nameserver/get_nameserver.go
+++ b/operations/nameserver/get_nameserver.go
@@ -23,12 +23,12 @@ package nameserver
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetNameserverHandlerFunc turns a function with the right signature into a get nameserver handler
@@ -93,6 +93,7 @@ func (o *GetNameserver) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetNameserverOKBody get nameserver o k body
+//
 // swagger:model GetNameserverOKBody
 type GetNameserverOKBody struct {
 
diff --git a/operations/nameserver/get_nameserver_parameters.go b/operations/nameserver/get_nameserver_parameters.go
index 026081d1..34120051 100644
--- a/operations/nameserver/get_nameserver_parameters.go
+++ b/operations/nameserver/get_nameserver_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetNameserverParams creates a new GetNameserverParams object
diff --git a/operations/nameserver/get_nameserver_responses.go b/operations/nameserver/get_nameserver_responses.go
index 030718b8..f09298ee 100644
--- a/operations/nameserver/get_nameserver_responses.go
+++ b/operations/nameserver/get_nameserver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetNameserverOKCode is the HTTP code returned for type GetNameserverOK
diff --git a/operations/nameserver/get_nameserver_urlbuilder.go b/operations/nameserver/get_nameserver_urlbuilder.go
index c7b65571..c2a3a0c6 100644
--- a/operations/nameserver/get_nameserver_urlbuilder.go
+++ b/operations/nameserver/get_nameserver_urlbuilder.go
@@ -75,17 +75,17 @@ func (o *GetNameserverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	resolver := o.Resolver
-	if resolver != "" {
-		qs.Set("resolver", resolver)
+	resolverQ := o.Resolver
+	if resolverQ != "" {
+		qs.Set("resolver", resolverQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/nameserver/get_nameservers.go b/operations/nameserver/get_nameservers.go
index ffdaa2c0..ef2642ec 100644
--- a/operations/nameserver/get_nameservers.go
+++ b/operations/nameserver/get_nameservers.go
@@ -23,13 +23,13 @@ package nameserver
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetNameserversHandlerFunc turns a function with the right signature into a get nameservers handler
@@ -94,6 +94,7 @@ func (o *GetNameservers) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetNameserversOKBody get nameservers o k body
+//
 // swagger:model GetNameserversOKBody
 type GetNameserversOKBody struct {
 
diff --git a/operations/nameserver/get_nameservers_parameters.go b/operations/nameserver/get_nameservers_parameters.go
index 91711a06..32332ddd 100644
--- a/operations/nameserver/get_nameservers_parameters.go
+++ b/operations/nameserver/get_nameservers_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetNameserversParams creates a new GetNameserversParams object
diff --git a/operations/nameserver/get_nameservers_responses.go b/operations/nameserver/get_nameservers_responses.go
index 67bda61a..75b6a669 100644
--- a/operations/nameserver/get_nameservers_responses.go
+++ b/operations/nameserver/get_nameservers_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetNameserversOKCode is the HTTP code returned for type GetNameserversOK
diff --git a/operations/nameserver/get_nameservers_urlbuilder.go b/operations/nameserver/get_nameservers_urlbuilder.go
index a35409d6..f4def149 100644
--- a/operations/nameserver/get_nameservers_urlbuilder.go
+++ b/operations/nameserver/get_nameservers_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetNameserversURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	resolver := o.Resolver
-	if resolver != "" {
-		qs.Set("resolver", resolver)
+	resolverQ := o.Resolver
+	if resolverQ != "" {
+		qs.Set("resolver", resolverQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/nameserver/replace_nameserver.go b/operations/nameserver/replace_nameserver.go
index c096dfef..25d09fc2 100644
--- a/operations/nameserver/replace_nameserver.go
+++ b/operations/nameserver/replace_nameserver.go
@@ -23,7 +23,7 @@ package nameserver
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceNameserverHandlerFunc turns a function with the right signature into a replace nameserver handler
diff --git a/operations/nameserver/replace_nameserver_parameters.go b/operations/nameserver/replace_nameserver_parameters.go
index edc08c49..6a3ff248 100644
--- a/operations/nameserver/replace_nameserver_parameters.go
+++ b/operations/nameserver/replace_nameserver_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceNameserverParams creates a new ReplaceNameserverParams object
diff --git a/operations/nameserver/replace_nameserver_responses.go b/operations/nameserver/replace_nameserver_responses.go
index e52c18f9..efdce19f 100644
--- a/operations/nameserver/replace_nameserver_responses.go
+++ b/operations/nameserver/replace_nameserver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceNameserverOKCode is the HTTP code returned for type ReplaceNameserverOK
diff --git a/operations/nameserver/replace_nameserver_urlbuilder.go b/operations/nameserver/replace_nameserver_urlbuilder.go
index c82c2675..09abd3e2 100644
--- a/operations/nameserver/replace_nameserver_urlbuilder.go
+++ b/operations/nameserver/replace_nameserver_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceNameserverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	resolver := o.Resolver
-	if resolver != "" {
-		qs.Set("resolver", resolver)
+	resolverQ := o.Resolver
+	if resolverQ != "" {
+		qs.Set("resolver", resolverQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer/create_peer.go b/operations/peer/create_peer.go
index c2758e64..59f1275b 100644
--- a/operations/peer/create_peer.go
+++ b/operations/peer/create_peer.go
@@ -23,7 +23,7 @@ package peer
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreatePeerHandlerFunc turns a function with the right signature into a create peer handler
diff --git a/operations/peer/create_peer_parameters.go b/operations/peer/create_peer_parameters.go
index d2b30cdf..144d06b7 100644
--- a/operations/peer/create_peer_parameters.go
+++ b/operations/peer/create_peer_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreatePeerParams creates a new CreatePeerParams object
diff --git a/operations/peer/create_peer_responses.go b/operations/peer/create_peer_responses.go
index b6cc535d..a1799fd7 100644
--- a/operations/peer/create_peer_responses.go
+++ b/operations/peer/create_peer_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreatePeerCreatedCode is the HTTP code returned for type CreatePeerCreated
diff --git a/operations/peer/create_peer_urlbuilder.go b/operations/peer/create_peer_urlbuilder.go
index a0512898..447ea517 100644
--- a/operations/peer/create_peer_urlbuilder.go
+++ b/operations/peer/create_peer_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *CreatePeerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer/delete_peer.go b/operations/peer/delete_peer.go
index 80269c88..495dca6f 100644
--- a/operations/peer/delete_peer.go
+++ b/operations/peer/delete_peer.go
@@ -23,7 +23,7 @@ package peer
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeletePeerHandlerFunc turns a function with the right signature into a delete peer handler
diff --git a/operations/peer/delete_peer_parameters.go b/operations/peer/delete_peer_parameters.go
index 9ee5d9f4..ac0fd747 100644
--- a/operations/peer/delete_peer_parameters.go
+++ b/operations/peer/delete_peer_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeletePeerParams creates a new DeletePeerParams object
diff --git a/operations/peer/delete_peer_responses.go b/operations/peer/delete_peer_responses.go
index c012bc54..817dd0aa 100644
--- a/operations/peer/delete_peer_responses.go
+++ b/operations/peer/delete_peer_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeletePeerAcceptedCode is the HTTP code returned for type DeletePeerAccepted
diff --git a/operations/peer/delete_peer_urlbuilder.go b/operations/peer/delete_peer_urlbuilder.go
index 28d90fe2..a905bdf3 100644
--- a/operations/peer/delete_peer_urlbuilder.go
+++ b/operations/peer/delete_peer_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *DeletePeerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer/get_peer_section.go b/operations/peer/get_peer_section.go
index 1b21db6c..587dba3e 100644
--- a/operations/peer/get_peer_section.go
+++ b/operations/peer/get_peer_section.go
@@ -23,12 +23,12 @@ package peer
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerSectionHandlerFunc turns a function with the right signature into a get peer section handler
@@ -93,6 +93,7 @@ func (o *GetPeerSection) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetPeerSectionOKBody get peer section o k body
+//
 // swagger:model GetPeerSectionOKBody
 type GetPeerSectionOKBody struct {
 
diff --git a/operations/peer/get_peer_section_parameters.go b/operations/peer/get_peer_section_parameters.go
index 7a2bae69..5175f22b 100644
--- a/operations/peer/get_peer_section_parameters.go
+++ b/operations/peer/get_peer_section_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetPeerSectionParams creates a new GetPeerSectionParams object
diff --git a/operations/peer/get_peer_section_responses.go b/operations/peer/get_peer_section_responses.go
index 00cfab50..f4a9f106 100644
--- a/operations/peer/get_peer_section_responses.go
+++ b/operations/peer/get_peer_section_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerSectionOKCode is the HTTP code returned for type GetPeerSectionOK
diff --git a/operations/peer/get_peer_section_urlbuilder.go b/operations/peer/get_peer_section_urlbuilder.go
index 1db9b641..8152e1bb 100644
--- a/operations/peer/get_peer_section_urlbuilder.go
+++ b/operations/peer/get_peer_section_urlbuilder.go
@@ -74,12 +74,12 @@ func (o *GetPeerSectionURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer/get_peer_sections.go b/operations/peer/get_peer_sections.go
index 01437c36..eb5561ee 100644
--- a/operations/peer/get_peer_sections.go
+++ b/operations/peer/get_peer_sections.go
@@ -23,13 +23,13 @@ package peer
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerSectionsHandlerFunc turns a function with the right signature into a get peer sections handler
@@ -94,6 +94,7 @@ func (o *GetPeerSections) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetPeerSectionsOKBody get peer sections o k body
+//
 // swagger:model GetPeerSectionsOKBody
 type GetPeerSectionsOKBody struct {
 
diff --git a/operations/peer/get_peer_sections_parameters.go b/operations/peer/get_peer_sections_parameters.go
index eed56dcb..489e23d6 100644
--- a/operations/peer/get_peer_sections_parameters.go
+++ b/operations/peer/get_peer_sections_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetPeerSectionsParams creates a new GetPeerSectionsParams object
diff --git a/operations/peer/get_peer_sections_responses.go b/operations/peer/get_peer_sections_responses.go
index 9f14d747..5b25d7ee 100644
--- a/operations/peer/get_peer_sections_responses.go
+++ b/operations/peer/get_peer_sections_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerSectionsOKCode is the HTTP code returned for type GetPeerSectionsOK
diff --git a/operations/peer/get_peer_sections_urlbuilder.go b/operations/peer/get_peer_sections_urlbuilder.go
index 0576117c..05fd532b 100644
--- a/operations/peer/get_peer_sections_urlbuilder.go
+++ b/operations/peer/get_peer_sections_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetPeerSectionsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer_entry/create_peer_entry.go b/operations/peer_entry/create_peer_entry.go
index fedc8cb0..e89e0cbf 100644
--- a/operations/peer_entry/create_peer_entry.go
+++ b/operations/peer_entry/create_peer_entry.go
@@ -23,7 +23,7 @@ package peer_entry
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreatePeerEntryHandlerFunc turns a function with the right signature into a create peer entry handler
diff --git a/operations/peer_entry/create_peer_entry_parameters.go b/operations/peer_entry/create_peer_entry_parameters.go
index 67959d40..59ac464c 100644
--- a/operations/peer_entry/create_peer_entry_parameters.go
+++ b/operations/peer_entry/create_peer_entry_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreatePeerEntryParams creates a new CreatePeerEntryParams object
diff --git a/operations/peer_entry/create_peer_entry_responses.go b/operations/peer_entry/create_peer_entry_responses.go
index 0baae1bc..05f10792 100644
--- a/operations/peer_entry/create_peer_entry_responses.go
+++ b/operations/peer_entry/create_peer_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreatePeerEntryCreatedCode is the HTTP code returned for type CreatePeerEntryCreated
diff --git a/operations/peer_entry/create_peer_entry_urlbuilder.go b/operations/peer_entry/create_peer_entry_urlbuilder.go
index ce0cb5ef..8266f8c2 100644
--- a/operations/peer_entry/create_peer_entry_urlbuilder.go
+++ b/operations/peer_entry/create_peer_entry_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreatePeerEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	peerSection := o.PeerSection
-	if peerSection != "" {
-		qs.Set("peer_section", peerSection)
+	peerSectionQ := o.PeerSection
+	if peerSectionQ != "" {
+		qs.Set("peer_section", peerSectionQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer_entry/delete_peer_entry.go b/operations/peer_entry/delete_peer_entry.go
index 4bb6fb95..58980936 100644
--- a/operations/peer_entry/delete_peer_entry.go
+++ b/operations/peer_entry/delete_peer_entry.go
@@ -23,7 +23,7 @@ package peer_entry
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeletePeerEntryHandlerFunc turns a function with the right signature into a delete peer entry handler
diff --git a/operations/peer_entry/delete_peer_entry_parameters.go b/operations/peer_entry/delete_peer_entry_parameters.go
index 5a48c546..c42eb143 100644
--- a/operations/peer_entry/delete_peer_entry_parameters.go
+++ b/operations/peer_entry/delete_peer_entry_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeletePeerEntryParams creates a new DeletePeerEntryParams object
diff --git a/operations/peer_entry/delete_peer_entry_responses.go b/operations/peer_entry/delete_peer_entry_responses.go
index 98cb30ac..9afb0cc0 100644
--- a/operations/peer_entry/delete_peer_entry_responses.go
+++ b/operations/peer_entry/delete_peer_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeletePeerEntryAcceptedCode is the HTTP code returned for type DeletePeerEntryAccepted
diff --git a/operations/peer_entry/delete_peer_entry_urlbuilder.go b/operations/peer_entry/delete_peer_entry_urlbuilder.go
index 10dafbcc..5d1f437d 100644
--- a/operations/peer_entry/delete_peer_entry_urlbuilder.go
+++ b/operations/peer_entry/delete_peer_entry_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeletePeerEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	peerSection := o.PeerSection
-	if peerSection != "" {
-		qs.Set("peer_section", peerSection)
+	peerSectionQ := o.PeerSection
+	if peerSectionQ != "" {
+		qs.Set("peer_section", peerSectionQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer_entry/get_peer_entries.go b/operations/peer_entry/get_peer_entries.go
index 4a780421..f1998e97 100644
--- a/operations/peer_entry/get_peer_entries.go
+++ b/operations/peer_entry/get_peer_entries.go
@@ -23,13 +23,13 @@ package peer_entry
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerEntriesHandlerFunc turns a function with the right signature into a get peer entries handler
@@ -94,6 +94,7 @@ func (o *GetPeerEntries) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetPeerEntriesOKBody get peer entries o k body
+//
 // swagger:model GetPeerEntriesOKBody
 type GetPeerEntriesOKBody struct {
 
diff --git a/operations/peer_entry/get_peer_entries_parameters.go b/operations/peer_entry/get_peer_entries_parameters.go
index c67ea2d3..b6812017 100644
--- a/operations/peer_entry/get_peer_entries_parameters.go
+++ b/operations/peer_entry/get_peer_entries_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetPeerEntriesParams creates a new GetPeerEntriesParams object
diff --git a/operations/peer_entry/get_peer_entries_responses.go b/operations/peer_entry/get_peer_entries_responses.go
index 88740380..217af9a2 100644
--- a/operations/peer_entry/get_peer_entries_responses.go
+++ b/operations/peer_entry/get_peer_entries_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerEntriesOKCode is the HTTP code returned for type GetPeerEntriesOK
diff --git a/operations/peer_entry/get_peer_entries_urlbuilder.go b/operations/peer_entry/get_peer_entries_urlbuilder.go
index 8f0fa438..55854138 100644
--- a/operations/peer_entry/get_peer_entries_urlbuilder.go
+++ b/operations/peer_entry/get_peer_entries_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetPeerEntriesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	peerSection := o.PeerSection
-	if peerSection != "" {
-		qs.Set("peer_section", peerSection)
+	peerSectionQ := o.PeerSection
+	if peerSectionQ != "" {
+		qs.Set("peer_section", peerSectionQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer_entry/get_peer_entry.go b/operations/peer_entry/get_peer_entry.go
index a18ec9cf..0c33fb6f 100644
--- a/operations/peer_entry/get_peer_entry.go
+++ b/operations/peer_entry/get_peer_entry.go
@@ -23,12 +23,12 @@ package peer_entry
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerEntryHandlerFunc turns a function with the right signature into a get peer entry handler
@@ -93,6 +93,7 @@ func (o *GetPeerEntry) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetPeerEntryOKBody get peer entry o k body
+//
 // swagger:model GetPeerEntryOKBody
 type GetPeerEntryOKBody struct {
 
diff --git a/operations/peer_entry/get_peer_entry_parameters.go b/operations/peer_entry/get_peer_entry_parameters.go
index ddabbf1b..45a49fa1 100644
--- a/operations/peer_entry/get_peer_entry_parameters.go
+++ b/operations/peer_entry/get_peer_entry_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetPeerEntryParams creates a new GetPeerEntryParams object
diff --git a/operations/peer_entry/get_peer_entry_responses.go b/operations/peer_entry/get_peer_entry_responses.go
index cbff758f..4053f1cf 100644
--- a/operations/peer_entry/get_peer_entry_responses.go
+++ b/operations/peer_entry/get_peer_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetPeerEntryOKCode is the HTTP code returned for type GetPeerEntryOK
diff --git a/operations/peer_entry/get_peer_entry_urlbuilder.go b/operations/peer_entry/get_peer_entry_urlbuilder.go
index 5dfb1c04..bac06739 100644
--- a/operations/peer_entry/get_peer_entry_urlbuilder.go
+++ b/operations/peer_entry/get_peer_entry_urlbuilder.go
@@ -75,17 +75,17 @@ func (o *GetPeerEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	peerSection := o.PeerSection
-	if peerSection != "" {
-		qs.Set("peer_section", peerSection)
+	peerSectionQ := o.PeerSection
+	if peerSectionQ != "" {
+		qs.Set("peer_section", peerSectionQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/peer_entry/replace_peer_entry.go b/operations/peer_entry/replace_peer_entry.go
index 3dbb813a..35db2273 100644
--- a/operations/peer_entry/replace_peer_entry.go
+++ b/operations/peer_entry/replace_peer_entry.go
@@ -23,7 +23,7 @@ package peer_entry
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplacePeerEntryHandlerFunc turns a function with the right signature into a replace peer entry handler
diff --git a/operations/peer_entry/replace_peer_entry_parameters.go b/operations/peer_entry/replace_peer_entry_parameters.go
index 7f769e0b..d87d5473 100644
--- a/operations/peer_entry/replace_peer_entry_parameters.go
+++ b/operations/peer_entry/replace_peer_entry_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplacePeerEntryParams creates a new ReplacePeerEntryParams object
diff --git a/operations/peer_entry/replace_peer_entry_responses.go b/operations/peer_entry/replace_peer_entry_responses.go
index 2297c76e..873f1ad3 100644
--- a/operations/peer_entry/replace_peer_entry_responses.go
+++ b/operations/peer_entry/replace_peer_entry_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplacePeerEntryOKCode is the HTTP code returned for type ReplacePeerEntryOK
diff --git a/operations/peer_entry/replace_peer_entry_urlbuilder.go b/operations/peer_entry/replace_peer_entry_urlbuilder.go
index 27a4c6cd..fec8310e 100644
--- a/operations/peer_entry/replace_peer_entry_urlbuilder.go
+++ b/operations/peer_entry/replace_peer_entry_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplacePeerEntryURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	peerSection := o.PeerSection
-	if peerSection != "" {
-		qs.Set("peer_section", peerSection)
+	peerSectionQ := o.PeerSection
+	if peerSectionQ != "" {
+		qs.Set("peer_section", peerSectionQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/reloads/get_reload.go b/operations/reloads/get_reload.go
index bbd954d7..76d5e7cf 100644
--- a/operations/reloads/get_reload.go
+++ b/operations/reloads/get_reload.go
@@ -23,7 +23,7 @@ package reloads
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetReloadHandlerFunc turns a function with the right signature into a get reload handler
diff --git a/operations/reloads/get_reload_parameters.go b/operations/reloads/get_reload_parameters.go
index 6cfb4998..def86d86 100644
--- a/operations/reloads/get_reload_parameters.go
+++ b/operations/reloads/get_reload_parameters.go
@@ -25,9 +25,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetReloadParams creates a new GetReloadParams object
diff --git a/operations/reloads/get_reload_responses.go b/operations/reloads/get_reload_responses.go
index dc9d27f7..6a4582c0 100644
--- a/operations/reloads/get_reload_responses.go
+++ b/operations/reloads/get_reload_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetReloadOKCode is the HTTP code returned for type GetReloadOK
diff --git a/operations/reloads/get_reloads.go b/operations/reloads/get_reloads.go
index 7856e0e9..61c52022 100644
--- a/operations/reloads/get_reloads.go
+++ b/operations/reloads/get_reloads.go
@@ -23,7 +23,7 @@ package reloads
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetReloadsHandlerFunc turns a function with the right signature into a get reloads handler
diff --git a/operations/reloads/get_reloads_responses.go b/operations/reloads/get_reloads_responses.go
index e07392c6..5432c0cc 100644
--- a/operations/reloads/get_reloads_responses.go
+++ b/operations/reloads/get_reloads_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetReloadsOKCode is the HTTP code returned for type GetReloadsOK
diff --git a/operations/resolver/create_resolver.go b/operations/resolver/create_resolver.go
index 0e7468d1..6c0691c2 100644
--- a/operations/resolver/create_resolver.go
+++ b/operations/resolver/create_resolver.go
@@ -23,7 +23,7 @@ package resolver
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateResolverHandlerFunc turns a function with the right signature into a create resolver handler
diff --git a/operations/resolver/create_resolver_parameters.go b/operations/resolver/create_resolver_parameters.go
index 44cd14c5..a8532784 100644
--- a/operations/resolver/create_resolver_parameters.go
+++ b/operations/resolver/create_resolver_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateResolverParams creates a new CreateResolverParams object
diff --git a/operations/resolver/create_resolver_responses.go b/operations/resolver/create_resolver_responses.go
index 54da10cf..3c37bec8 100644
--- a/operations/resolver/create_resolver_responses.go
+++ b/operations/resolver/create_resolver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateResolverCreatedCode is the HTTP code returned for type CreateResolverCreated
diff --git a/operations/resolver/create_resolver_urlbuilder.go b/operations/resolver/create_resolver_urlbuilder.go
index 5e53839d..d33078f8 100644
--- a/operations/resolver/create_resolver_urlbuilder.go
+++ b/operations/resolver/create_resolver_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *CreateResolverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/resolver/delete_resolver.go b/operations/resolver/delete_resolver.go
index 86e7884c..8884b765 100644
--- a/operations/resolver/delete_resolver.go
+++ b/operations/resolver/delete_resolver.go
@@ -23,7 +23,7 @@ package resolver
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteResolverHandlerFunc turns a function with the right signature into a delete resolver handler
diff --git a/operations/resolver/delete_resolver_parameters.go b/operations/resolver/delete_resolver_parameters.go
index f84017b2..3ede36cf 100644
--- a/operations/resolver/delete_resolver_parameters.go
+++ b/operations/resolver/delete_resolver_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteResolverParams creates a new DeleteResolverParams object
diff --git a/operations/resolver/delete_resolver_responses.go b/operations/resolver/delete_resolver_responses.go
index dbad80ad..061d9ad9 100644
--- a/operations/resolver/delete_resolver_responses.go
+++ b/operations/resolver/delete_resolver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteResolverAcceptedCode is the HTTP code returned for type DeleteResolverAccepted
diff --git a/operations/resolver/delete_resolver_urlbuilder.go b/operations/resolver/delete_resolver_urlbuilder.go
index 3e58979d..61a6d034 100644
--- a/operations/resolver/delete_resolver_urlbuilder.go
+++ b/operations/resolver/delete_resolver_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *DeleteResolverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/resolver/get_resolver.go b/operations/resolver/get_resolver.go
index c01aefd2..9cd71d87 100644
--- a/operations/resolver/get_resolver.go
+++ b/operations/resolver/get_resolver.go
@@ -23,12 +23,12 @@ package resolver
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetResolverHandlerFunc turns a function with the right signature into a get resolver handler
@@ -93,6 +93,7 @@ func (o *GetResolver) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetResolverOKBody get resolver o k body
+//
 // swagger:model GetResolverOKBody
 type GetResolverOKBody struct {
 
diff --git a/operations/resolver/get_resolver_parameters.go b/operations/resolver/get_resolver_parameters.go
index 5a0e477a..7a744042 100644
--- a/operations/resolver/get_resolver_parameters.go
+++ b/operations/resolver/get_resolver_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetResolverParams creates a new GetResolverParams object
diff --git a/operations/resolver/get_resolver_responses.go b/operations/resolver/get_resolver_responses.go
index d0aaad98..24d4c767 100644
--- a/operations/resolver/get_resolver_responses.go
+++ b/operations/resolver/get_resolver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetResolverOKCode is the HTTP code returned for type GetResolverOK
diff --git a/operations/resolver/get_resolver_urlbuilder.go b/operations/resolver/get_resolver_urlbuilder.go
index e6e68ad5..4894d9a4 100644
--- a/operations/resolver/get_resolver_urlbuilder.go
+++ b/operations/resolver/get_resolver_urlbuilder.go
@@ -74,12 +74,12 @@ func (o *GetResolverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/resolver/get_resolvers.go b/operations/resolver/get_resolvers.go
index 5f5fb8fc..5d9fdcf2 100644
--- a/operations/resolver/get_resolvers.go
+++ b/operations/resolver/get_resolvers.go
@@ -23,13 +23,13 @@ package resolver
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetResolversHandlerFunc turns a function with the right signature into a get resolvers handler
@@ -94,6 +94,7 @@ func (o *GetResolvers) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetResolversOKBody get resolvers o k body
+//
 // swagger:model GetResolversOKBody
 type GetResolversOKBody struct {
 
diff --git a/operations/resolver/get_resolvers_parameters.go b/operations/resolver/get_resolvers_parameters.go
index 2e252e84..34c12a03 100644
--- a/operations/resolver/get_resolvers_parameters.go
+++ b/operations/resolver/get_resolvers_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetResolversParams creates a new GetResolversParams object
diff --git a/operations/resolver/get_resolvers_responses.go b/operations/resolver/get_resolvers_responses.go
index 20977f41..4318242c 100644
--- a/operations/resolver/get_resolvers_responses.go
+++ b/operations/resolver/get_resolvers_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetResolversOKCode is the HTTP code returned for type GetResolversOK
diff --git a/operations/resolver/get_resolvers_urlbuilder.go b/operations/resolver/get_resolvers_urlbuilder.go
index 4f2d1ee6..2bf4a5e7 100644
--- a/operations/resolver/get_resolvers_urlbuilder.go
+++ b/operations/resolver/get_resolvers_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetResolversURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/resolver/replace_resolver.go b/operations/resolver/replace_resolver.go
index f34914bb..065824da 100644
--- a/operations/resolver/replace_resolver.go
+++ b/operations/resolver/replace_resolver.go
@@ -23,7 +23,7 @@ package resolver
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceResolverHandlerFunc turns a function with the right signature into a replace resolver handler
diff --git a/operations/resolver/replace_resolver_parameters.go b/operations/resolver/replace_resolver_parameters.go
index fc14682a..312b912d 100644
--- a/operations/resolver/replace_resolver_parameters.go
+++ b/operations/resolver/replace_resolver_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceResolverParams creates a new ReplaceResolverParams object
diff --git a/operations/resolver/replace_resolver_responses.go b/operations/resolver/replace_resolver_responses.go
index 550f7398..87e3be3c 100644
--- a/operations/resolver/replace_resolver_responses.go
+++ b/operations/resolver/replace_resolver_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceResolverOKCode is the HTTP code returned for type ReplaceResolverOK
diff --git a/operations/resolver/replace_resolver_urlbuilder.go b/operations/resolver/replace_resolver_urlbuilder.go
index b03fe8a5..f274b584 100644
--- a/operations/resolver/replace_resolver_urlbuilder.go
+++ b/operations/resolver/replace_resolver_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *ReplaceResolverURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/create_server.go b/operations/server/create_server.go
index 6bccb59e..e5e8cbfb 100644
--- a/operations/server/create_server.go
+++ b/operations/server/create_server.go
@@ -23,7 +23,7 @@ package server
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateServerHandlerFunc turns a function with the right signature into a create server handler
diff --git a/operations/server/create_server_parameters.go b/operations/server/create_server_parameters.go
index 0bbb39df..deec9f69 100644
--- a/operations/server/create_server_parameters.go
+++ b/operations/server/create_server_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateServerParams creates a new CreateServerParams object
diff --git a/operations/server/create_server_responses.go b/operations/server/create_server_responses.go
index a46eff6e..f646fe33 100644
--- a/operations/server/create_server_responses.go
+++ b/operations/server/create_server_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateServerCreatedCode is the HTTP code returned for type CreateServerCreated
diff --git a/operations/server/create_server_urlbuilder.go b/operations/server/create_server_urlbuilder.go
index c10a4d1d..b8efc7bf 100644
--- a/operations/server/create_server_urlbuilder.go
+++ b/operations/server/create_server_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateServerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/delete_server.go b/operations/server/delete_server.go
index a2cf9945..9d861096 100644
--- a/operations/server/delete_server.go
+++ b/operations/server/delete_server.go
@@ -23,7 +23,7 @@ package server
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteServerHandlerFunc turns a function with the right signature into a delete server handler
diff --git a/operations/server/delete_server_parameters.go b/operations/server/delete_server_parameters.go
index 37b8987b..7e9d95e3 100644
--- a/operations/server/delete_server_parameters.go
+++ b/operations/server/delete_server_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteServerParams creates a new DeleteServerParams object
diff --git a/operations/server/delete_server_responses.go b/operations/server/delete_server_responses.go
index f34614e1..282eea32 100644
--- a/operations/server/delete_server_responses.go
+++ b/operations/server/delete_server_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteServerAcceptedCode is the HTTP code returned for type DeleteServerAccepted
diff --git a/operations/server/delete_server_urlbuilder.go b/operations/server/delete_server_urlbuilder.go
index f2431ee9..ee2ee974 100644
--- a/operations/server/delete_server_urlbuilder.go
+++ b/operations/server/delete_server_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteServerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/get_runtime_server.go b/operations/server/get_runtime_server.go
index cf8c6d07..1aa34ddc 100644
--- a/operations/server/get_runtime_server.go
+++ b/operations/server/get_runtime_server.go
@@ -23,7 +23,7 @@ package server
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetRuntimeServerHandlerFunc turns a function with the right signature into a get runtime server handler
diff --git a/operations/server/get_runtime_server_parameters.go b/operations/server/get_runtime_server_parameters.go
index 684f6461..9d883ed4 100644
--- a/operations/server/get_runtime_server_parameters.go
+++ b/operations/server/get_runtime_server_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetRuntimeServerParams creates a new GetRuntimeServerParams object
diff --git a/operations/server/get_runtime_server_responses.go b/operations/server/get_runtime_server_responses.go
index 2274cf80..2f243b1c 100644
--- a/operations/server/get_runtime_server_responses.go
+++ b/operations/server/get_runtime_server_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetRuntimeServerOKCode is the HTTP code returned for type GetRuntimeServerOK
diff --git a/operations/server/get_runtime_server_urlbuilder.go b/operations/server/get_runtime_server_urlbuilder.go
index 8adb4f20..0fb2b6ab 100644
--- a/operations/server/get_runtime_server_urlbuilder.go
+++ b/operations/server/get_runtime_server_urlbuilder.go
@@ -74,9 +74,9 @@ func (o *GetRuntimeServerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/get_runtime_servers.go b/operations/server/get_runtime_servers.go
index 615de0d3..0000a85e 100644
--- a/operations/server/get_runtime_servers.go
+++ b/operations/server/get_runtime_servers.go
@@ -23,7 +23,7 @@ package server
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetRuntimeServersHandlerFunc turns a function with the right signature into a get runtime servers handler
diff --git a/operations/server/get_runtime_servers_parameters.go b/operations/server/get_runtime_servers_parameters.go
index f07ef7b7..2f776b07 100644
--- a/operations/server/get_runtime_servers_parameters.go
+++ b/operations/server/get_runtime_servers_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetRuntimeServersParams creates a new GetRuntimeServersParams object
diff --git a/operations/server/get_runtime_servers_responses.go b/operations/server/get_runtime_servers_responses.go
index af4338b4..6dcbd463 100644
--- a/operations/server/get_runtime_servers_responses.go
+++ b/operations/server/get_runtime_servers_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetRuntimeServersOKCode is the HTTP code returned for type GetRuntimeServersOK
diff --git a/operations/server/get_runtime_servers_urlbuilder.go b/operations/server/get_runtime_servers_urlbuilder.go
index 006a4bdd..70f9ff4d 100644
--- a/operations/server/get_runtime_servers_urlbuilder.go
+++ b/operations/server/get_runtime_servers_urlbuilder.go
@@ -64,9 +64,9 @@ func (o *GetRuntimeServersURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/get_server.go b/operations/server/get_server.go
index e1685cf8..4a68a3d4 100644
--- a/operations/server/get_server.go
+++ b/operations/server/get_server.go
@@ -23,12 +23,12 @@ package server
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServerHandlerFunc turns a function with the right signature into a get server handler
@@ -93,6 +93,7 @@ func (o *GetServer) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetServerOKBody get server o k body
+//
 // swagger:model GetServerOKBody
 type GetServerOKBody struct {
 
diff --git a/operations/server/get_server_parameters.go b/operations/server/get_server_parameters.go
index 0098f399..93941e87 100644
--- a/operations/server/get_server_parameters.go
+++ b/operations/server/get_server_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetServerParams creates a new GetServerParams object
diff --git a/operations/server/get_server_responses.go b/operations/server/get_server_responses.go
index 4f3df95e..5921d08f 100644
--- a/operations/server/get_server_responses.go
+++ b/operations/server/get_server_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServerOKCode is the HTTP code returned for type GetServerOK
diff --git a/operations/server/get_server_urlbuilder.go b/operations/server/get_server_urlbuilder.go
index d06c477e..df4d979c 100644
--- a/operations/server/get_server_urlbuilder.go
+++ b/operations/server/get_server_urlbuilder.go
@@ -75,17 +75,17 @@ func (o *GetServerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/get_servers.go b/operations/server/get_servers.go
index e0bd98bd..b71f04f4 100644
--- a/operations/server/get_servers.go
+++ b/operations/server/get_servers.go
@@ -23,13 +23,13 @@ package server
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServersHandlerFunc turns a function with the right signature into a get servers handler
@@ -94,6 +94,7 @@ func (o *GetServers) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetServersOKBody get servers o k body
+//
 // swagger:model GetServersOKBody
 type GetServersOKBody struct {
 
diff --git a/operations/server/get_servers_parameters.go b/operations/server/get_servers_parameters.go
index 8f34fd5d..8c7b5733 100644
--- a/operations/server/get_servers_parameters.go
+++ b/operations/server/get_servers_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetServersParams creates a new GetServersParams object
diff --git a/operations/server/get_servers_responses.go b/operations/server/get_servers_responses.go
index e0bc43a0..b3a3c8a8 100644
--- a/operations/server/get_servers_responses.go
+++ b/operations/server/get_servers_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServersOKCode is the HTTP code returned for type GetServersOK
diff --git a/operations/server/get_servers_urlbuilder.go b/operations/server/get_servers_urlbuilder.go
index 961e57f1..9447e69c 100644
--- a/operations/server/get_servers_urlbuilder.go
+++ b/operations/server/get_servers_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetServersURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/replace_runtime_server.go b/operations/server/replace_runtime_server.go
index cd72cdc6..09f79117 100644
--- a/operations/server/replace_runtime_server.go
+++ b/operations/server/replace_runtime_server.go
@@ -23,7 +23,7 @@ package server
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceRuntimeServerHandlerFunc turns a function with the right signature into a replace runtime server handler
diff --git a/operations/server/replace_runtime_server_parameters.go b/operations/server/replace_runtime_server_parameters.go
index dba82337..7ed6c57c 100644
--- a/operations/server/replace_runtime_server_parameters.go
+++ b/operations/server/replace_runtime_server_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceRuntimeServerParams creates a new ReplaceRuntimeServerParams object
diff --git a/operations/server/replace_runtime_server_responses.go b/operations/server/replace_runtime_server_responses.go
index 1713bc5f..9c146a15 100644
--- a/operations/server/replace_runtime_server_responses.go
+++ b/operations/server/replace_runtime_server_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceRuntimeServerOKCode is the HTTP code returned for type ReplaceRuntimeServerOK
diff --git a/operations/server/replace_runtime_server_urlbuilder.go b/operations/server/replace_runtime_server_urlbuilder.go
index c3327c95..51b8cf75 100644
--- a/operations/server/replace_runtime_server_urlbuilder.go
+++ b/operations/server/replace_runtime_server_urlbuilder.go
@@ -74,9 +74,9 @@ func (o *ReplaceRuntimeServerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server/replace_server.go b/operations/server/replace_server.go
index 54da8e04..f871b524 100644
--- a/operations/server/replace_server.go
+++ b/operations/server/replace_server.go
@@ -23,7 +23,7 @@ package server
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceServerHandlerFunc turns a function with the right signature into a replace server handler
diff --git a/operations/server/replace_server_parameters.go b/operations/server/replace_server_parameters.go
index 690d8593..cc8e53b8 100644
--- a/operations/server/replace_server_parameters.go
+++ b/operations/server/replace_server_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceServerParams creates a new ReplaceServerParams object
diff --git a/operations/server/replace_server_responses.go b/operations/server/replace_server_responses.go
index 0ec5881f..6a1acb4b 100644
--- a/operations/server/replace_server_responses.go
+++ b/operations/server/replace_server_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceServerOKCode is the HTTP code returned for type ReplaceServerOK
diff --git a/operations/server/replace_server_urlbuilder.go b/operations/server/replace_server_urlbuilder.go
index f2d9ab6a..841c9a29 100644
--- a/operations/server/replace_server_urlbuilder.go
+++ b/operations/server/replace_server_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceServerURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server_switching_rule/create_server_switching_rule.go b/operations/server_switching_rule/create_server_switching_rule.go
index f8d76db9..1ec13b70 100644
--- a/operations/server_switching_rule/create_server_switching_rule.go
+++ b/operations/server_switching_rule/create_server_switching_rule.go
@@ -23,7 +23,7 @@ package server_switching_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateServerSwitchingRuleHandlerFunc turns a function with the right signature into a create server switching rule handler
diff --git a/operations/server_switching_rule/create_server_switching_rule_parameters.go b/operations/server_switching_rule/create_server_switching_rule_parameters.go
index 2123f51e..d0caecce 100644
--- a/operations/server_switching_rule/create_server_switching_rule_parameters.go
+++ b/operations/server_switching_rule/create_server_switching_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateServerSwitchingRuleParams creates a new CreateServerSwitchingRuleParams object
diff --git a/operations/server_switching_rule/create_server_switching_rule_responses.go b/operations/server_switching_rule/create_server_switching_rule_responses.go
index 348265a7..147c8256 100644
--- a/operations/server_switching_rule/create_server_switching_rule_responses.go
+++ b/operations/server_switching_rule/create_server_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateServerSwitchingRuleCreatedCode is the HTTP code returned for type CreateServerSwitchingRuleCreated
diff --git a/operations/server_switching_rule/create_server_switching_rule_urlbuilder.go b/operations/server_switching_rule/create_server_switching_rule_urlbuilder.go
index 07fa3b90..ed779757 100644
--- a/operations/server_switching_rule/create_server_switching_rule_urlbuilder.go
+++ b/operations/server_switching_rule/create_server_switching_rule_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateServerSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server_switching_rule/delete_server_switching_rule.go b/operations/server_switching_rule/delete_server_switching_rule.go
index e1591aa9..505f3aea 100644
--- a/operations/server_switching_rule/delete_server_switching_rule.go
+++ b/operations/server_switching_rule/delete_server_switching_rule.go
@@ -23,7 +23,7 @@ package server_switching_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteServerSwitchingRuleHandlerFunc turns a function with the right signature into a delete server switching rule handler
diff --git a/operations/server_switching_rule/delete_server_switching_rule_parameters.go b/operations/server_switching_rule/delete_server_switching_rule_parameters.go
index 6b9c85cd..36ef18d4 100644
--- a/operations/server_switching_rule/delete_server_switching_rule_parameters.go
+++ b/operations/server_switching_rule/delete_server_switching_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteServerSwitchingRuleParams creates a new DeleteServerSwitchingRuleParams object
diff --git a/operations/server_switching_rule/delete_server_switching_rule_responses.go b/operations/server_switching_rule/delete_server_switching_rule_responses.go
index d6818853..3fce8ab3 100644
--- a/operations/server_switching_rule/delete_server_switching_rule_responses.go
+++ b/operations/server_switching_rule/delete_server_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteServerSwitchingRuleAcceptedCode is the HTTP code returned for type DeleteServerSwitchingRuleAccepted
diff --git a/operations/server_switching_rule/delete_server_switching_rule_urlbuilder.go b/operations/server_switching_rule/delete_server_switching_rule_urlbuilder.go
index e6fab9eb..55e35408 100644
--- a/operations/server_switching_rule/delete_server_switching_rule_urlbuilder.go
+++ b/operations/server_switching_rule/delete_server_switching_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteServerSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server_switching_rule/get_server_switching_rule.go b/operations/server_switching_rule/get_server_switching_rule.go
index 6457c403..4a657cb9 100644
--- a/operations/server_switching_rule/get_server_switching_rule.go
+++ b/operations/server_switching_rule/get_server_switching_rule.go
@@ -23,12 +23,12 @@ package server_switching_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServerSwitchingRuleHandlerFunc turns a function with the right signature into a get server switching rule handler
@@ -93,6 +93,7 @@ func (o *GetServerSwitchingRule) ServeHTTP(rw http.ResponseWriter, r *http.Reque
 }
 
 // GetServerSwitchingRuleOKBody get server switching rule o k body
+//
 // swagger:model GetServerSwitchingRuleOKBody
 type GetServerSwitchingRuleOKBody struct {
 
diff --git a/operations/server_switching_rule/get_server_switching_rule_parameters.go b/operations/server_switching_rule/get_server_switching_rule_parameters.go
index e10bd748..404250b0 100644
--- a/operations/server_switching_rule/get_server_switching_rule_parameters.go
+++ b/operations/server_switching_rule/get_server_switching_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetServerSwitchingRuleParams creates a new GetServerSwitchingRuleParams object
diff --git a/operations/server_switching_rule/get_server_switching_rule_responses.go b/operations/server_switching_rule/get_server_switching_rule_responses.go
index 9e2f22b7..6a562b1f 100644
--- a/operations/server_switching_rule/get_server_switching_rule_responses.go
+++ b/operations/server_switching_rule/get_server_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServerSwitchingRuleOKCode is the HTTP code returned for type GetServerSwitchingRuleOK
diff --git a/operations/server_switching_rule/get_server_switching_rule_urlbuilder.go b/operations/server_switching_rule/get_server_switching_rule_urlbuilder.go
index eb231123..1268b15c 100644
--- a/operations/server_switching_rule/get_server_switching_rule_urlbuilder.go
+++ b/operations/server_switching_rule/get_server_switching_rule_urlbuilder.go
@@ -77,17 +77,17 @@ func (o *GetServerSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server_switching_rule/get_server_switching_rules.go b/operations/server_switching_rule/get_server_switching_rules.go
index f3ad40e1..4ac2937d 100644
--- a/operations/server_switching_rule/get_server_switching_rules.go
+++ b/operations/server_switching_rule/get_server_switching_rules.go
@@ -23,13 +23,13 @@ package server_switching_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServerSwitchingRulesHandlerFunc turns a function with the right signature into a get server switching rules handler
@@ -94,6 +94,7 @@ func (o *GetServerSwitchingRules) ServeHTTP(rw http.ResponseWriter, r *http.Requ
 }
 
 // GetServerSwitchingRulesOKBody get server switching rules o k body
+//
 // swagger:model GetServerSwitchingRulesOKBody
 type GetServerSwitchingRulesOKBody struct {
 
diff --git a/operations/server_switching_rule/get_server_switching_rules_parameters.go b/operations/server_switching_rule/get_server_switching_rules_parameters.go
index 12f82213..c2e0cfe5 100644
--- a/operations/server_switching_rule/get_server_switching_rules_parameters.go
+++ b/operations/server_switching_rule/get_server_switching_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetServerSwitchingRulesParams creates a new GetServerSwitchingRulesParams object
diff --git a/operations/server_switching_rule/get_server_switching_rules_responses.go b/operations/server_switching_rule/get_server_switching_rules_responses.go
index 6068177f..5a709409 100644
--- a/operations/server_switching_rule/get_server_switching_rules_responses.go
+++ b/operations/server_switching_rule/get_server_switching_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetServerSwitchingRulesOKCode is the HTTP code returned for type GetServerSwitchingRulesOK
diff --git a/operations/server_switching_rule/get_server_switching_rules_urlbuilder.go b/operations/server_switching_rule/get_server_switching_rules_urlbuilder.go
index a08b7825..0f1cc5cb 100644
--- a/operations/server_switching_rule/get_server_switching_rules_urlbuilder.go
+++ b/operations/server_switching_rule/get_server_switching_rules_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetServerSwitchingRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/server_switching_rule/replace_server_switching_rule.go b/operations/server_switching_rule/replace_server_switching_rule.go
index ef1fe7c9..9863e34e 100644
--- a/operations/server_switching_rule/replace_server_switching_rule.go
+++ b/operations/server_switching_rule/replace_server_switching_rule.go
@@ -23,7 +23,7 @@ package server_switching_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceServerSwitchingRuleHandlerFunc turns a function with the right signature into a replace server switching rule handler
diff --git a/operations/server_switching_rule/replace_server_switching_rule_parameters.go b/operations/server_switching_rule/replace_server_switching_rule_parameters.go
index e5f85473..abfd5ee5 100644
--- a/operations/server_switching_rule/replace_server_switching_rule_parameters.go
+++ b/operations/server_switching_rule/replace_server_switching_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceServerSwitchingRuleParams creates a new ReplaceServerSwitchingRuleParams object
diff --git a/operations/server_switching_rule/replace_server_switching_rule_responses.go b/operations/server_switching_rule/replace_server_switching_rule_responses.go
index 211b01df..e83da06d 100644
--- a/operations/server_switching_rule/replace_server_switching_rule_responses.go
+++ b/operations/server_switching_rule/replace_server_switching_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceServerSwitchingRuleOKCode is the HTTP code returned for type ReplaceServerSwitchingRuleOK
diff --git a/operations/server_switching_rule/replace_server_switching_rule_urlbuilder.go b/operations/server_switching_rule/replace_server_switching_rule_urlbuilder.go
index 03de01b2..ef0d606c 100644
--- a/operations/server_switching_rule/replace_server_switching_rule_urlbuilder.go
+++ b/operations/server_switching_rule/replace_server_switching_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceServerSwitchingRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/sites/create_site.go b/operations/sites/create_site.go
index 07df65b1..d40b6562 100644
--- a/operations/sites/create_site.go
+++ b/operations/sites/create_site.go
@@ -23,7 +23,7 @@ package sites
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateSiteHandlerFunc turns a function with the right signature into a create site handler
diff --git a/operations/sites/create_site_parameters.go b/operations/sites/create_site_parameters.go
index 8c3a3cb4..05364904 100644
--- a/operations/sites/create_site_parameters.go
+++ b/operations/sites/create_site_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateSiteParams creates a new CreateSiteParams object
diff --git a/operations/sites/create_site_responses.go b/operations/sites/create_site_responses.go
index 867f637e..99dc3a1c 100644
--- a/operations/sites/create_site_responses.go
+++ b/operations/sites/create_site_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateSiteCreatedCode is the HTTP code returned for type CreateSiteCreated
diff --git a/operations/sites/create_site_urlbuilder.go b/operations/sites/create_site_urlbuilder.go
index 13a8f413..7f8d00ff 100644
--- a/operations/sites/create_site_urlbuilder.go
+++ b/operations/sites/create_site_urlbuilder.go
@@ -68,28 +68,28 @@ func (o *CreateSiteURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/sites/delete_site.go b/operations/sites/delete_site.go
index f55a3dac..2be1a68e 100644
--- a/operations/sites/delete_site.go
+++ b/operations/sites/delete_site.go
@@ -23,7 +23,7 @@ package sites
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteSiteHandlerFunc turns a function with the right signature into a delete site handler
diff --git a/operations/sites/delete_site_parameters.go b/operations/sites/delete_site_parameters.go
index 5b126d63..168195a2 100644
--- a/operations/sites/delete_site_parameters.go
+++ b/operations/sites/delete_site_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteSiteParams creates a new DeleteSiteParams object
diff --git a/operations/sites/delete_site_responses.go b/operations/sites/delete_site_responses.go
index 91463f32..030e06c7 100644
--- a/operations/sites/delete_site_responses.go
+++ b/operations/sites/delete_site_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteSiteAcceptedCode is the HTTP code returned for type DeleteSiteAccepted
diff --git a/operations/sites/delete_site_urlbuilder.go b/operations/sites/delete_site_urlbuilder.go
index e0599079..b40294e0 100644
--- a/operations/sites/delete_site_urlbuilder.go
+++ b/operations/sites/delete_site_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *DeleteSiteURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/sites/get_site.go b/operations/sites/get_site.go
index 25455abe..e095ddc4 100644
--- a/operations/sites/get_site.go
+++ b/operations/sites/get_site.go
@@ -23,12 +23,12 @@ package sites
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetSiteHandlerFunc turns a function with the right signature into a get site handler
@@ -93,6 +93,7 @@ func (o *GetSite) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetSiteOKBody get site o k body
+//
 // swagger:model GetSiteOKBody
 type GetSiteOKBody struct {
 
diff --git a/operations/sites/get_site_parameters.go b/operations/sites/get_site_parameters.go
index e6f6bed6..e83f3585 100644
--- a/operations/sites/get_site_parameters.go
+++ b/operations/sites/get_site_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetSiteParams creates a new GetSiteParams object
diff --git a/operations/sites/get_site_responses.go b/operations/sites/get_site_responses.go
index a5e578e8..e301ce4b 100644
--- a/operations/sites/get_site_responses.go
+++ b/operations/sites/get_site_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetSiteOKCode is the HTTP code returned for type GetSiteOK
diff --git a/operations/sites/get_site_urlbuilder.go b/operations/sites/get_site_urlbuilder.go
index 4f392d39..0fc6244e 100644
--- a/operations/sites/get_site_urlbuilder.go
+++ b/operations/sites/get_site_urlbuilder.go
@@ -74,12 +74,12 @@ func (o *GetSiteURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/sites/get_sites.go b/operations/sites/get_sites.go
index 93e8a171..29044667 100644
--- a/operations/sites/get_sites.go
+++ b/operations/sites/get_sites.go
@@ -23,13 +23,13 @@ package sites
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetSitesHandlerFunc turns a function with the right signature into a get sites handler
@@ -94,6 +94,7 @@ func (o *GetSites) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetSitesOKBody get sites o k body
+//
 // swagger:model GetSitesOKBody
 type GetSitesOKBody struct {
 
diff --git a/operations/sites/get_sites_parameters.go b/operations/sites/get_sites_parameters.go
index 6b2bc77f..3406b025 100644
--- a/operations/sites/get_sites_parameters.go
+++ b/operations/sites/get_sites_parameters.go
@@ -26,8 +26,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetSitesParams creates a new GetSitesParams object
diff --git a/operations/sites/get_sites_responses.go b/operations/sites/get_sites_responses.go
index da3fdd47..d9e0d0a7 100644
--- a/operations/sites/get_sites_responses.go
+++ b/operations/sites/get_sites_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetSitesOKCode is the HTTP code returned for type GetSitesOK
diff --git a/operations/sites/get_sites_urlbuilder.go b/operations/sites/get_sites_urlbuilder.go
index a6e61fab..ff059687 100644
--- a/operations/sites/get_sites_urlbuilder.go
+++ b/operations/sites/get_sites_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetSitesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/sites/replace_site.go b/operations/sites/replace_site.go
index f06ffd9f..296d009f 100644
--- a/operations/sites/replace_site.go
+++ b/operations/sites/replace_site.go
@@ -23,7 +23,7 @@ package sites
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceSiteHandlerFunc turns a function with the right signature into a replace site handler
diff --git a/operations/sites/replace_site_parameters.go b/operations/sites/replace_site_parameters.go
index 7fed81ca..d510e228 100644
--- a/operations/sites/replace_site_parameters.go
+++ b/operations/sites/replace_site_parameters.go
@@ -27,11 +27,10 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceSiteParams creates a new ReplaceSiteParams object
diff --git a/operations/sites/replace_site_responses.go b/operations/sites/replace_site_responses.go
index 8794b295..31e117bb 100644
--- a/operations/sites/replace_site_responses.go
+++ b/operations/sites/replace_site_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceSiteOKCode is the HTTP code returned for type ReplaceSiteOK
diff --git a/operations/sites/replace_site_urlbuilder.go b/operations/sites/replace_site_urlbuilder.go
index 112f32e8..b29fd97b 100644
--- a/operations/sites/replace_site_urlbuilder.go
+++ b/operations/sites/replace_site_urlbuilder.go
@@ -78,28 +78,28 @@ func (o *ReplaceSiteURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/specification/get_specification.go b/operations/specification/get_specification.go
index 2f6e086d..e3b9fa49 100644
--- a/operations/specification/get_specification.go
+++ b/operations/specification/get_specification.go
@@ -23,7 +23,7 @@ package specification
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetSpecificationHandlerFunc turns a function with the right signature into a get specification handler
diff --git a/operations/specification/get_specification_responses.go b/operations/specification/get_specification_responses.go
index e5e4429b..ca5a8af8 100644
--- a/operations/specification/get_specification_responses.go
+++ b/operations/specification/get_specification_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetSpecificationOKCode is the HTTP code returned for type GetSpecificationOK
diff --git a/operations/stats/get_stats.go b/operations/stats/get_stats.go
index 5fd55be2..5fba0e77 100644
--- a/operations/stats/get_stats.go
+++ b/operations/stats/get_stats.go
@@ -23,7 +23,7 @@ package stats
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetStatsHandlerFunc turns a function with the right signature into a get stats handler
diff --git a/operations/stats/get_stats_parameters.go b/operations/stats/get_stats_parameters.go
index 09901dee..4e7c3532 100644
--- a/operations/stats/get_stats_parameters.go
+++ b/operations/stats/get_stats_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetStatsParams creates a new GetStatsParams object
diff --git a/operations/stats/get_stats_responses.go b/operations/stats/get_stats_responses.go
index dcfb7500..8ed68ee7 100644
--- a/operations/stats/get_stats_responses.go
+++ b/operations/stats/get_stats_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStatsOKCode is the HTTP code returned for type GetStatsOK
diff --git a/operations/stats/get_stats_urlbuilder.go b/operations/stats/get_stats_urlbuilder.go
index 5dcaad33..59784bf2 100644
--- a/operations/stats/get_stats_urlbuilder.go
+++ b/operations/stats/get_stats_urlbuilder.go
@@ -66,28 +66,28 @@ func (o *GetStatsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var name string
+	var nameQ string
 	if o.Name != nil {
-		name = *o.Name
+		nameQ = *o.Name
 	}
-	if name != "" {
-		qs.Set("name", name)
+	if nameQ != "" {
+		qs.Set("name", nameQ)
 	}
 
-	var parent string
+	var parentQ string
 	if o.Parent != nil {
-		parent = *o.Parent
+		parentQ = *o.Parent
 	}
-	if parent != "" {
-		qs.Set("parent", parent)
+	if parentQ != "" {
+		qs.Set("parent", parentQ)
 	}
 
-	var typeVar string
+	var typeVarQ string
 	if o.Type != nil {
-		typeVar = *o.Type
+		typeVarQ = *o.Type
 	}
-	if typeVar != "" {
-		qs.Set("type", typeVar)
+	if typeVarQ != "" {
+		qs.Set("type", typeVarQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_rule/create_stick_rule.go b/operations/stick_rule/create_stick_rule.go
index 0f4b9d66..1ecf0e58 100644
--- a/operations/stick_rule/create_stick_rule.go
+++ b/operations/stick_rule/create_stick_rule.go
@@ -23,7 +23,7 @@ package stick_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateStickRuleHandlerFunc turns a function with the right signature into a create stick rule handler
diff --git a/operations/stick_rule/create_stick_rule_parameters.go b/operations/stick_rule/create_stick_rule_parameters.go
index 7af0b8d9..22323beb 100644
--- a/operations/stick_rule/create_stick_rule_parameters.go
+++ b/operations/stick_rule/create_stick_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateStickRuleParams creates a new CreateStickRuleParams object
diff --git a/operations/stick_rule/create_stick_rule_responses.go b/operations/stick_rule/create_stick_rule_responses.go
index 9303ca13..a1c4db67 100644
--- a/operations/stick_rule/create_stick_rule_responses.go
+++ b/operations/stick_rule/create_stick_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateStickRuleCreatedCode is the HTTP code returned for type CreateStickRuleCreated
diff --git a/operations/stick_rule/create_stick_rule_urlbuilder.go b/operations/stick_rule/create_stick_rule_urlbuilder.go
index d025b13a..f2663156 100644
--- a/operations/stick_rule/create_stick_rule_urlbuilder.go
+++ b/operations/stick_rule/create_stick_rule_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateStickRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_rule/delete_stick_rule.go b/operations/stick_rule/delete_stick_rule.go
index c47298cc..419da63e 100644
--- a/operations/stick_rule/delete_stick_rule.go
+++ b/operations/stick_rule/delete_stick_rule.go
@@ -23,7 +23,7 @@ package stick_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteStickRuleHandlerFunc turns a function with the right signature into a delete stick rule handler
diff --git a/operations/stick_rule/delete_stick_rule_parameters.go b/operations/stick_rule/delete_stick_rule_parameters.go
index f63a1c23..a1134401 100644
--- a/operations/stick_rule/delete_stick_rule_parameters.go
+++ b/operations/stick_rule/delete_stick_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteStickRuleParams creates a new DeleteStickRuleParams object
diff --git a/operations/stick_rule/delete_stick_rule_responses.go b/operations/stick_rule/delete_stick_rule_responses.go
index 3b7da22e..f26fd52a 100644
--- a/operations/stick_rule/delete_stick_rule_responses.go
+++ b/operations/stick_rule/delete_stick_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteStickRuleAcceptedCode is the HTTP code returned for type DeleteStickRuleAccepted
diff --git a/operations/stick_rule/delete_stick_rule_urlbuilder.go b/operations/stick_rule/delete_stick_rule_urlbuilder.go
index 4e1ce7cb..82699679 100644
--- a/operations/stick_rule/delete_stick_rule_urlbuilder.go
+++ b/operations/stick_rule/delete_stick_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteStickRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_rule/get_stick_rule.go b/operations/stick_rule/get_stick_rule.go
index 4421cccd..e701957f 100644
--- a/operations/stick_rule/get_stick_rule.go
+++ b/operations/stick_rule/get_stick_rule.go
@@ -23,12 +23,12 @@ package stick_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickRuleHandlerFunc turns a function with the right signature into a get stick rule handler
@@ -93,6 +93,7 @@ func (o *GetStickRule) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetStickRuleOKBody get stick rule o k body
+//
 // swagger:model GetStickRuleOKBody
 type GetStickRuleOKBody struct {
 
diff --git a/operations/stick_rule/get_stick_rule_parameters.go b/operations/stick_rule/get_stick_rule_parameters.go
index 44c5120f..45ac2d4d 100644
--- a/operations/stick_rule/get_stick_rule_parameters.go
+++ b/operations/stick_rule/get_stick_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetStickRuleParams creates a new GetStickRuleParams object
diff --git a/operations/stick_rule/get_stick_rule_responses.go b/operations/stick_rule/get_stick_rule_responses.go
index ffe4a0a7..3105b8d0 100644
--- a/operations/stick_rule/get_stick_rule_responses.go
+++ b/operations/stick_rule/get_stick_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickRuleOKCode is the HTTP code returned for type GetStickRuleOK
diff --git a/operations/stick_rule/get_stick_rule_urlbuilder.go b/operations/stick_rule/get_stick_rule_urlbuilder.go
index a84b90db..0620d9b8 100644
--- a/operations/stick_rule/get_stick_rule_urlbuilder.go
+++ b/operations/stick_rule/get_stick_rule_urlbuilder.go
@@ -77,17 +77,17 @@ func (o *GetStickRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_rule/get_stick_rules.go b/operations/stick_rule/get_stick_rules.go
index b37bc952..8d537b7c 100644
--- a/operations/stick_rule/get_stick_rules.go
+++ b/operations/stick_rule/get_stick_rules.go
@@ -23,13 +23,13 @@ package stick_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickRulesHandlerFunc turns a function with the right signature into a get stick rules handler
@@ -94,6 +94,7 @@ func (o *GetStickRules) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetStickRulesOKBody get stick rules o k body
+//
 // swagger:model GetStickRulesOKBody
 type GetStickRulesOKBody struct {
 
diff --git a/operations/stick_rule/get_stick_rules_parameters.go b/operations/stick_rule/get_stick_rules_parameters.go
index 4d59c548..4d8c1e24 100644
--- a/operations/stick_rule/get_stick_rules_parameters.go
+++ b/operations/stick_rule/get_stick_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetStickRulesParams creates a new GetStickRulesParams object
diff --git a/operations/stick_rule/get_stick_rules_responses.go b/operations/stick_rule/get_stick_rules_responses.go
index c654693e..b3cf0b34 100644
--- a/operations/stick_rule/get_stick_rules_responses.go
+++ b/operations/stick_rule/get_stick_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickRulesOKCode is the HTTP code returned for type GetStickRulesOK
diff --git a/operations/stick_rule/get_stick_rules_urlbuilder.go b/operations/stick_rule/get_stick_rules_urlbuilder.go
index eb8da6c4..996a88e5 100644
--- a/operations/stick_rule/get_stick_rules_urlbuilder.go
+++ b/operations/stick_rule/get_stick_rules_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetStickRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_rule/replace_stick_rule.go b/operations/stick_rule/replace_stick_rule.go
index 139530b7..f6787125 100644
--- a/operations/stick_rule/replace_stick_rule.go
+++ b/operations/stick_rule/replace_stick_rule.go
@@ -23,7 +23,7 @@ package stick_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceStickRuleHandlerFunc turns a function with the right signature into a replace stick rule handler
diff --git a/operations/stick_rule/replace_stick_rule_parameters.go b/operations/stick_rule/replace_stick_rule_parameters.go
index 08eb1c25..4d54583c 100644
--- a/operations/stick_rule/replace_stick_rule_parameters.go
+++ b/operations/stick_rule/replace_stick_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceStickRuleParams creates a new ReplaceStickRuleParams object
diff --git a/operations/stick_rule/replace_stick_rule_responses.go b/operations/stick_rule/replace_stick_rule_responses.go
index 45c9dff6..58abbd90 100644
--- a/operations/stick_rule/replace_stick_rule_responses.go
+++ b/operations/stick_rule/replace_stick_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceStickRuleOKCode is the HTTP code returned for type ReplaceStickRuleOK
diff --git a/operations/stick_rule/replace_stick_rule_urlbuilder.go b/operations/stick_rule/replace_stick_rule_urlbuilder.go
index 535ba8a2..170d8abf 100644
--- a/operations/stick_rule/replace_stick_rule_urlbuilder.go
+++ b/operations/stick_rule/replace_stick_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceStickRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_table/get_stick_table.go b/operations/stick_table/get_stick_table.go
index fc9bb31c..382c69cf 100644
--- a/operations/stick_table/get_stick_table.go
+++ b/operations/stick_table/get_stick_table.go
@@ -23,7 +23,7 @@ package stick_table
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetStickTableHandlerFunc turns a function with the right signature into a get stick table handler
diff --git a/operations/stick_table/get_stick_table_entries.go b/operations/stick_table/get_stick_table_entries.go
index f8a0b9b5..90a750b3 100644
--- a/operations/stick_table/get_stick_table_entries.go
+++ b/operations/stick_table/get_stick_table_entries.go
@@ -23,7 +23,7 @@ package stick_table
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetStickTableEntriesHandlerFunc turns a function with the right signature into a get stick table entries handler
diff --git a/operations/stick_table/get_stick_table_entries_parameters.go b/operations/stick_table/get_stick_table_entries_parameters.go
index f8385c3e..9bb43c11 100644
--- a/operations/stick_table/get_stick_table_entries_parameters.go
+++ b/operations/stick_table/get_stick_table_entries_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetStickTableEntriesParams creates a new GetStickTableEntriesParams object
diff --git a/operations/stick_table/get_stick_table_entries_responses.go b/operations/stick_table/get_stick_table_entries_responses.go
index 4cb09a37..6329cb1f 100644
--- a/operations/stick_table/get_stick_table_entries_responses.go
+++ b/operations/stick_table/get_stick_table_entries_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickTableEntriesOKCode is the HTTP code returned for type GetStickTableEntriesOK
diff --git a/operations/stick_table/get_stick_table_entries_urlbuilder.go b/operations/stick_table/get_stick_table_entries_urlbuilder.go
index a07843df..957fce80 100644
--- a/operations/stick_table/get_stick_table_entries_urlbuilder.go
+++ b/operations/stick_table/get_stick_table_entries_urlbuilder.go
@@ -71,46 +71,46 @@ func (o *GetStickTableEntriesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var count string
+	var countQ string
 	if o.Count != nil {
-		count = swag.FormatInt64(*o.Count)
+		countQ = swag.FormatInt64(*o.Count)
 	}
-	if count != "" {
-		qs.Set("count", count)
+	if countQ != "" {
+		qs.Set("count", countQ)
 	}
 
-	var filter string
+	var filterQ string
 	if o.Filter != nil {
-		filter = *o.Filter
+		filterQ = *o.Filter
 	}
-	if filter != "" {
-		qs.Set("filter", filter)
+	if filterQ != "" {
+		qs.Set("filter", filterQ)
 	}
 
-	var key string
+	var keyQ string
 	if o.Key != nil {
-		key = *o.Key
+		keyQ = *o.Key
 	}
-	if key != "" {
-		qs.Set("key", key)
+	if keyQ != "" {
+		qs.Set("key", keyQ)
 	}
 
-	var offset string
+	var offsetQ string
 	if o.Offset != nil {
-		offset = swag.FormatInt64(*o.Offset)
+		offsetQ = swag.FormatInt64(*o.Offset)
 	}
-	if offset != "" {
-		qs.Set("offset", offset)
+	if offsetQ != "" {
+		qs.Set("offset", offsetQ)
 	}
 
-	process := swag.FormatInt64(o.Process)
-	if process != "" {
-		qs.Set("process", process)
+	processQ := swag.FormatInt64(o.Process)
+	if processQ != "" {
+		qs.Set("process", processQ)
 	}
 
-	stickTable := o.StickTable
-	if stickTable != "" {
-		qs.Set("stick_table", stickTable)
+	stickTableQ := o.StickTable
+	if stickTableQ != "" {
+		qs.Set("stick_table", stickTableQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_table/get_stick_table_parameters.go b/operations/stick_table/get_stick_table_parameters.go
index e3c2eca6..53ca73bb 100644
--- a/operations/stick_table/get_stick_table_parameters.go
+++ b/operations/stick_table/get_stick_table_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetStickTableParams creates a new GetStickTableParams object
diff --git a/operations/stick_table/get_stick_table_responses.go b/operations/stick_table/get_stick_table_responses.go
index 2b9d3e8c..e42ccb07 100644
--- a/operations/stick_table/get_stick_table_responses.go
+++ b/operations/stick_table/get_stick_table_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickTableOKCode is the HTTP code returned for type GetStickTableOK
diff --git a/operations/stick_table/get_stick_table_urlbuilder.go b/operations/stick_table/get_stick_table_urlbuilder.go
index 16f90702..f3ee58f2 100644
--- a/operations/stick_table/get_stick_table_urlbuilder.go
+++ b/operations/stick_table/get_stick_table_urlbuilder.go
@@ -76,9 +76,9 @@ func (o *GetStickTableURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	process := swag.FormatInt64(o.Process)
-	if process != "" {
-		qs.Set("process", process)
+	processQ := swag.FormatInt64(o.Process)
+	if processQ != "" {
+		qs.Set("process", processQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/stick_table/get_stick_tables.go b/operations/stick_table/get_stick_tables.go
index 76517cfb..e4a5e8b3 100644
--- a/operations/stick_table/get_stick_tables.go
+++ b/operations/stick_table/get_stick_tables.go
@@ -23,7 +23,7 @@ package stick_table
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetStickTablesHandlerFunc turns a function with the right signature into a get stick tables handler
diff --git a/operations/stick_table/get_stick_tables_parameters.go b/operations/stick_table/get_stick_tables_parameters.go
index b6335134..ce49f943 100644
--- a/operations/stick_table/get_stick_tables_parameters.go
+++ b/operations/stick_table/get_stick_tables_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetStickTablesParams creates a new GetStickTablesParams object
diff --git a/operations/stick_table/get_stick_tables_responses.go b/operations/stick_table/get_stick_tables_responses.go
index fe9362b6..f560530f 100644
--- a/operations/stick_table/get_stick_tables_responses.go
+++ b/operations/stick_table/get_stick_tables_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetStickTablesOKCode is the HTTP code returned for type GetStickTablesOK
diff --git a/operations/stick_table/get_stick_tables_urlbuilder.go b/operations/stick_table/get_stick_tables_urlbuilder.go
index b2f2d485..58647111 100644
--- a/operations/stick_table/get_stick_tables_urlbuilder.go
+++ b/operations/stick_table/get_stick_tables_urlbuilder.go
@@ -66,12 +66,12 @@ func (o *GetStickTablesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var process string
+	var processQ string
 	if o.Process != nil {
-		process = swag.FormatInt64(*o.Process)
+		processQ = swag.FormatInt64(*o.Process)
 	}
-	if process != "" {
-		qs.Set("process", process)
+	if processQ != "" {
+		qs.Set("process", processQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_request_rule/create_tcp_request_rule.go b/operations/tcp_request_rule/create_tcp_request_rule.go
index c9e41b62..b04d7369 100644
--- a/operations/tcp_request_rule/create_tcp_request_rule.go
+++ b/operations/tcp_request_rule/create_tcp_request_rule.go
@@ -23,7 +23,7 @@ package tcp_request_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateTCPRequestRuleHandlerFunc turns a function with the right signature into a create TCP request rule handler
diff --git a/operations/tcp_request_rule/create_tcp_request_rule_parameters.go b/operations/tcp_request_rule/create_tcp_request_rule_parameters.go
index 44f9b49c..87366720 100644
--- a/operations/tcp_request_rule/create_tcp_request_rule_parameters.go
+++ b/operations/tcp_request_rule/create_tcp_request_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateTCPRequestRuleParams creates a new CreateTCPRequestRuleParams object
diff --git a/operations/tcp_request_rule/create_tcp_request_rule_responses.go b/operations/tcp_request_rule/create_tcp_request_rule_responses.go
index 80b7d163..a9838bd9 100644
--- a/operations/tcp_request_rule/create_tcp_request_rule_responses.go
+++ b/operations/tcp_request_rule/create_tcp_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateTCPRequestRuleCreatedCode is the HTTP code returned for type CreateTCPRequestRuleCreated
diff --git a/operations/tcp_request_rule/create_tcp_request_rule_urlbuilder.go b/operations/tcp_request_rule/create_tcp_request_rule_urlbuilder.go
index 2bab752b..6892b504 100644
--- a/operations/tcp_request_rule/create_tcp_request_rule_urlbuilder.go
+++ b/operations/tcp_request_rule/create_tcp_request_rule_urlbuilder.go
@@ -70,38 +70,38 @@ func (o *CreateTCPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_request_rule/delete_tcp_request_rule.go b/operations/tcp_request_rule/delete_tcp_request_rule.go
index 3b8c471c..62aa05a5 100644
--- a/operations/tcp_request_rule/delete_tcp_request_rule.go
+++ b/operations/tcp_request_rule/delete_tcp_request_rule.go
@@ -23,7 +23,7 @@ package tcp_request_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteTCPRequestRuleHandlerFunc turns a function with the right signature into a delete TCP request rule handler
diff --git a/operations/tcp_request_rule/delete_tcp_request_rule_parameters.go b/operations/tcp_request_rule/delete_tcp_request_rule_parameters.go
index 44eb9009..2ceafa4e 100644
--- a/operations/tcp_request_rule/delete_tcp_request_rule_parameters.go
+++ b/operations/tcp_request_rule/delete_tcp_request_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteTCPRequestRuleParams creates a new DeleteTCPRequestRuleParams object
diff --git a/operations/tcp_request_rule/delete_tcp_request_rule_responses.go b/operations/tcp_request_rule/delete_tcp_request_rule_responses.go
index 368fadd4..486a465e 100644
--- a/operations/tcp_request_rule/delete_tcp_request_rule_responses.go
+++ b/operations/tcp_request_rule/delete_tcp_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteTCPRequestRuleAcceptedCode is the HTTP code returned for type DeleteTCPRequestRuleAccepted
diff --git a/operations/tcp_request_rule/delete_tcp_request_rule_urlbuilder.go b/operations/tcp_request_rule/delete_tcp_request_rule_urlbuilder.go
index f4e9b427..3b0f1c8b 100644
--- a/operations/tcp_request_rule/delete_tcp_request_rule_urlbuilder.go
+++ b/operations/tcp_request_rule/delete_tcp_request_rule_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *DeleteTCPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_request_rule/get_tcp_request_rule.go b/operations/tcp_request_rule/get_tcp_request_rule.go
index 2f648bff..2add3776 100644
--- a/operations/tcp_request_rule/get_tcp_request_rule.go
+++ b/operations/tcp_request_rule/get_tcp_request_rule.go
@@ -23,12 +23,12 @@ package tcp_request_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPRequestRuleHandlerFunc turns a function with the right signature into a get TCP request rule handler
@@ -93,6 +93,7 @@ func (o *GetTCPRequestRule) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 }
 
 // GetTCPRequestRuleOKBody get TCP request rule o k body
+//
 // swagger:model GetTCPRequestRuleOKBody
 type GetTCPRequestRuleOKBody struct {
 
diff --git a/operations/tcp_request_rule/get_tcp_request_rule_parameters.go b/operations/tcp_request_rule/get_tcp_request_rule_parameters.go
index 8b956fc5..ded5b6c8 100644
--- a/operations/tcp_request_rule/get_tcp_request_rule_parameters.go
+++ b/operations/tcp_request_rule/get_tcp_request_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetTCPRequestRuleParams creates a new GetTCPRequestRuleParams object
diff --git a/operations/tcp_request_rule/get_tcp_request_rule_responses.go b/operations/tcp_request_rule/get_tcp_request_rule_responses.go
index d5c83bd2..7fc0d929 100644
--- a/operations/tcp_request_rule/get_tcp_request_rule_responses.go
+++ b/operations/tcp_request_rule/get_tcp_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPRequestRuleOKCode is the HTTP code returned for type GetTCPRequestRuleOK
diff --git a/operations/tcp_request_rule/get_tcp_request_rule_urlbuilder.go b/operations/tcp_request_rule/get_tcp_request_rule_urlbuilder.go
index f9ed189f..24ed1c7d 100644
--- a/operations/tcp_request_rule/get_tcp_request_rule_urlbuilder.go
+++ b/operations/tcp_request_rule/get_tcp_request_rule_urlbuilder.go
@@ -78,22 +78,22 @@ func (o *GetTCPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_request_rule/get_tcp_request_rules.go b/operations/tcp_request_rule/get_tcp_request_rules.go
index a2a285a4..7cb98ea8 100644
--- a/operations/tcp_request_rule/get_tcp_request_rules.go
+++ b/operations/tcp_request_rule/get_tcp_request_rules.go
@@ -23,13 +23,13 @@ package tcp_request_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPRequestRulesHandlerFunc turns a function with the right signature into a get TCP request rules handler
@@ -94,6 +94,7 @@ func (o *GetTCPRequestRules) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 }
 
 // GetTCPRequestRulesOKBody get TCP request rules o k body
+//
 // swagger:model GetTCPRequestRulesOKBody
 type GetTCPRequestRulesOKBody struct {
 
diff --git a/operations/tcp_request_rule/get_tcp_request_rules_parameters.go b/operations/tcp_request_rule/get_tcp_request_rules_parameters.go
index 4c64293c..27bb9a9b 100644
--- a/operations/tcp_request_rule/get_tcp_request_rules_parameters.go
+++ b/operations/tcp_request_rule/get_tcp_request_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetTCPRequestRulesParams creates a new GetTCPRequestRulesParams object
diff --git a/operations/tcp_request_rule/get_tcp_request_rules_responses.go b/operations/tcp_request_rule/get_tcp_request_rules_responses.go
index 4b062872..2f730f29 100644
--- a/operations/tcp_request_rule/get_tcp_request_rules_responses.go
+++ b/operations/tcp_request_rule/get_tcp_request_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPRequestRulesOKCode is the HTTP code returned for type GetTCPRequestRulesOK
diff --git a/operations/tcp_request_rule/get_tcp_request_rules_urlbuilder.go b/operations/tcp_request_rule/get_tcp_request_rules_urlbuilder.go
index 9aadbab1..2fb49fe0 100644
--- a/operations/tcp_request_rule/get_tcp_request_rules_urlbuilder.go
+++ b/operations/tcp_request_rule/get_tcp_request_rules_urlbuilder.go
@@ -66,22 +66,22 @@ func (o *GetTCPRequestRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_request_rule/replace_tcp_request_rule.go b/operations/tcp_request_rule/replace_tcp_request_rule.go
index 68e9807f..d3668ec9 100644
--- a/operations/tcp_request_rule/replace_tcp_request_rule.go
+++ b/operations/tcp_request_rule/replace_tcp_request_rule.go
@@ -23,7 +23,7 @@ package tcp_request_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceTCPRequestRuleHandlerFunc turns a function with the right signature into a replace TCP request rule handler
diff --git a/operations/tcp_request_rule/replace_tcp_request_rule_parameters.go b/operations/tcp_request_rule/replace_tcp_request_rule_parameters.go
index b1fadbaf..2d668cae 100644
--- a/operations/tcp_request_rule/replace_tcp_request_rule_parameters.go
+++ b/operations/tcp_request_rule/replace_tcp_request_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceTCPRequestRuleParams creates a new ReplaceTCPRequestRuleParams object
diff --git a/operations/tcp_request_rule/replace_tcp_request_rule_responses.go b/operations/tcp_request_rule/replace_tcp_request_rule_responses.go
index 39bfdbe4..7123ca1e 100644
--- a/operations/tcp_request_rule/replace_tcp_request_rule_responses.go
+++ b/operations/tcp_request_rule/replace_tcp_request_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceTCPRequestRuleOKCode is the HTTP code returned for type ReplaceTCPRequestRuleOK
diff --git a/operations/tcp_request_rule/replace_tcp_request_rule_urlbuilder.go b/operations/tcp_request_rule/replace_tcp_request_rule_urlbuilder.go
index abf043e5..f8d8bc20 100644
--- a/operations/tcp_request_rule/replace_tcp_request_rule_urlbuilder.go
+++ b/operations/tcp_request_rule/replace_tcp_request_rule_urlbuilder.go
@@ -80,38 +80,38 @@ func (o *ReplaceTCPRequestRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	parentName := o.ParentName
-	if parentName != "" {
-		qs.Set("parent_name", parentName)
+	parentNameQ := o.ParentName
+	if parentNameQ != "" {
+		qs.Set("parent_name", parentNameQ)
 	}
 
-	parentType := o.ParentType
-	if parentType != "" {
-		qs.Set("parent_type", parentType)
+	parentTypeQ := o.ParentType
+	if parentTypeQ != "" {
+		qs.Set("parent_type", parentTypeQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_response_rule/create_tcp_response_rule.go b/operations/tcp_response_rule/create_tcp_response_rule.go
index fc4f62a6..f7794dfd 100644
--- a/operations/tcp_response_rule/create_tcp_response_rule.go
+++ b/operations/tcp_response_rule/create_tcp_response_rule.go
@@ -23,7 +23,7 @@ package tcp_response_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CreateTCPResponseRuleHandlerFunc turns a function with the right signature into a create TCP response rule handler
diff --git a/operations/tcp_response_rule/create_tcp_response_rule_parameters.go b/operations/tcp_response_rule/create_tcp_response_rule_parameters.go
index 28a9e951..15f9184e 100644
--- a/operations/tcp_response_rule/create_tcp_response_rule_parameters.go
+++ b/operations/tcp_response_rule/create_tcp_response_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewCreateTCPResponseRuleParams creates a new CreateTCPResponseRuleParams object
diff --git a/operations/tcp_response_rule/create_tcp_response_rule_responses.go b/operations/tcp_response_rule/create_tcp_response_rule_responses.go
index 62c5c60e..3ff3dcb7 100644
--- a/operations/tcp_response_rule/create_tcp_response_rule_responses.go
+++ b/operations/tcp_response_rule/create_tcp_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CreateTCPResponseRuleCreatedCode is the HTTP code returned for type CreateTCPResponseRuleCreated
diff --git a/operations/tcp_response_rule/create_tcp_response_rule_urlbuilder.go b/operations/tcp_response_rule/create_tcp_response_rule_urlbuilder.go
index b058f029..90f8e0c2 100644
--- a/operations/tcp_response_rule/create_tcp_response_rule_urlbuilder.go
+++ b/operations/tcp_response_rule/create_tcp_response_rule_urlbuilder.go
@@ -69,33 +69,33 @@ func (o *CreateTCPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_response_rule/delete_tcp_response_rule.go b/operations/tcp_response_rule/delete_tcp_response_rule.go
index fb7b18f8..b5ae05e5 100644
--- a/operations/tcp_response_rule/delete_tcp_response_rule.go
+++ b/operations/tcp_response_rule/delete_tcp_response_rule.go
@@ -23,7 +23,7 @@ package tcp_response_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteTCPResponseRuleHandlerFunc turns a function with the right signature into a delete TCP response rule handler
diff --git a/operations/tcp_response_rule/delete_tcp_response_rule_parameters.go b/operations/tcp_response_rule/delete_tcp_response_rule_parameters.go
index 513019c9..63de3283 100644
--- a/operations/tcp_response_rule/delete_tcp_response_rule_parameters.go
+++ b/operations/tcp_response_rule/delete_tcp_response_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewDeleteTCPResponseRuleParams creates a new DeleteTCPResponseRuleParams object
diff --git a/operations/tcp_response_rule/delete_tcp_response_rule_responses.go b/operations/tcp_response_rule/delete_tcp_response_rule_responses.go
index 3585c4d4..d76e2b67 100644
--- a/operations/tcp_response_rule/delete_tcp_response_rule_responses.go
+++ b/operations/tcp_response_rule/delete_tcp_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteTCPResponseRuleAcceptedCode is the HTTP code returned for type DeleteTCPResponseRuleAccepted
diff --git a/operations/tcp_response_rule/delete_tcp_response_rule_urlbuilder.go b/operations/tcp_response_rule/delete_tcp_response_rule_urlbuilder.go
index 6be924b5..75aebc4c 100644
--- a/operations/tcp_response_rule/delete_tcp_response_rule_urlbuilder.go
+++ b/operations/tcp_response_rule/delete_tcp_response_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *DeleteTCPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_response_rule/get_tcp_response_rule.go b/operations/tcp_response_rule/get_tcp_response_rule.go
index ed476b49..537caed9 100644
--- a/operations/tcp_response_rule/get_tcp_response_rule.go
+++ b/operations/tcp_response_rule/get_tcp_response_rule.go
@@ -23,12 +23,12 @@ package tcp_response_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPResponseRuleHandlerFunc turns a function with the right signature into a get TCP response rule handler
@@ -93,6 +93,7 @@ func (o *GetTCPResponseRule) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 }
 
 // GetTCPResponseRuleOKBody get TCP response rule o k body
+//
 // swagger:model GetTCPResponseRuleOKBody
 type GetTCPResponseRuleOKBody struct {
 
diff --git a/operations/tcp_response_rule/get_tcp_response_rule_parameters.go b/operations/tcp_response_rule/get_tcp_response_rule_parameters.go
index d58a1f46..d9b586e5 100644
--- a/operations/tcp_response_rule/get_tcp_response_rule_parameters.go
+++ b/operations/tcp_response_rule/get_tcp_response_rule_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetTCPResponseRuleParams creates a new GetTCPResponseRuleParams object
diff --git a/operations/tcp_response_rule/get_tcp_response_rule_responses.go b/operations/tcp_response_rule/get_tcp_response_rule_responses.go
index 6bd142fe..addd583f 100644
--- a/operations/tcp_response_rule/get_tcp_response_rule_responses.go
+++ b/operations/tcp_response_rule/get_tcp_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPResponseRuleOKCode is the HTTP code returned for type GetTCPResponseRuleOK
diff --git a/operations/tcp_response_rule/get_tcp_response_rule_urlbuilder.go b/operations/tcp_response_rule/get_tcp_response_rule_urlbuilder.go
index 31ded0ff..eccd0e10 100644
--- a/operations/tcp_response_rule/get_tcp_response_rule_urlbuilder.go
+++ b/operations/tcp_response_rule/get_tcp_response_rule_urlbuilder.go
@@ -77,17 +77,17 @@ func (o *GetTCPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_response_rule/get_tcp_response_rules.go b/operations/tcp_response_rule/get_tcp_response_rules.go
index 1b05a1e1..b6eb1f9c 100644
--- a/operations/tcp_response_rule/get_tcp_response_rules.go
+++ b/operations/tcp_response_rule/get_tcp_response_rules.go
@@ -23,13 +23,13 @@ package tcp_response_rule
 import (
 	"net/http"
 
-	errors "github.com/go-openapi/errors"
-	middleware "github.com/go-openapi/runtime/middleware"
-	strfmt "github.com/go-openapi/strfmt"
-	swag "github.com/go-openapi/swag"
-	validate "github.com/go-openapi/validate"
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPResponseRulesHandlerFunc turns a function with the right signature into a get TCP response rules handler
@@ -94,6 +94,7 @@ func (o *GetTCPResponseRules) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 }
 
 // GetTCPResponseRulesOKBody get TCP response rules o k body
+//
 // swagger:model GetTCPResponseRulesOKBody
 type GetTCPResponseRulesOKBody struct {
 
diff --git a/operations/tcp_response_rule/get_tcp_response_rules_parameters.go b/operations/tcp_response_rule/get_tcp_response_rules_parameters.go
index 14bfd60c..60ff123e 100644
--- a/operations/tcp_response_rule/get_tcp_response_rules_parameters.go
+++ b/operations/tcp_response_rule/get_tcp_response_rules_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetTCPResponseRulesParams creates a new GetTCPResponseRulesParams object
diff --git a/operations/tcp_response_rule/get_tcp_response_rules_responses.go b/operations/tcp_response_rule/get_tcp_response_rules_responses.go
index f82e27aa..d9e2c4e6 100644
--- a/operations/tcp_response_rule/get_tcp_response_rules_responses.go
+++ b/operations/tcp_response_rule/get_tcp_response_rules_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTCPResponseRulesOKCode is the HTTP code returned for type GetTCPResponseRulesOK
diff --git a/operations/tcp_response_rule/get_tcp_response_rules_urlbuilder.go b/operations/tcp_response_rule/get_tcp_response_rules_urlbuilder.go
index 34944cc5..c9ea735f 100644
--- a/operations/tcp_response_rule/get_tcp_response_rules_urlbuilder.go
+++ b/operations/tcp_response_rule/get_tcp_response_rules_urlbuilder.go
@@ -65,17 +65,17 @@ func (o *GetTCPResponseRulesURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/tcp_response_rule/replace_tcp_response_rule.go b/operations/tcp_response_rule/replace_tcp_response_rule.go
index 6b4f7692..0e2ce744 100644
--- a/operations/tcp_response_rule/replace_tcp_response_rule.go
+++ b/operations/tcp_response_rule/replace_tcp_response_rule.go
@@ -23,7 +23,7 @@ package tcp_response_rule
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // ReplaceTCPResponseRuleHandlerFunc turns a function with the right signature into a replace TCP response rule handler
diff --git a/operations/tcp_response_rule/replace_tcp_response_rule_parameters.go b/operations/tcp_response_rule/replace_tcp_response_rule_parameters.go
index 8c271009..3af01005 100644
--- a/operations/tcp_response_rule/replace_tcp_response_rule_parameters.go
+++ b/operations/tcp_response_rule/replace_tcp_response_rule_parameters.go
@@ -27,12 +27,11 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 
-	strfmt "github.com/go-openapi/strfmt"
-
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // NewReplaceTCPResponseRuleParams creates a new ReplaceTCPResponseRuleParams object
diff --git a/operations/tcp_response_rule/replace_tcp_response_rule_responses.go b/operations/tcp_response_rule/replace_tcp_response_rule_responses.go
index 3cc1a6a5..7bbb4438 100644
--- a/operations/tcp_response_rule/replace_tcp_response_rule_responses.go
+++ b/operations/tcp_response_rule/replace_tcp_response_rule_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // ReplaceTCPResponseRuleOKCode is the HTTP code returned for type ReplaceTCPResponseRuleOK
diff --git a/operations/tcp_response_rule/replace_tcp_response_rule_urlbuilder.go b/operations/tcp_response_rule/replace_tcp_response_rule_urlbuilder.go
index 71abaed1..50ff5b61 100644
--- a/operations/tcp_response_rule/replace_tcp_response_rule_urlbuilder.go
+++ b/operations/tcp_response_rule/replace_tcp_response_rule_urlbuilder.go
@@ -79,33 +79,33 @@ func (o *ReplaceTCPResponseRuleURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	backend := o.Backend
-	if backend != "" {
-		qs.Set("backend", backend)
+	backendQ := o.Backend
+	if backendQ != "" {
+		qs.Set("backend", backendQ)
 	}
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
-	var transactionID string
+	var transactionIDQ string
 	if o.TransactionID != nil {
-		transactionID = *o.TransactionID
+		transactionIDQ = *o.TransactionID
 	}
-	if transactionID != "" {
-		qs.Set("transaction_id", transactionID)
+	if transactionIDQ != "" {
+		qs.Set("transaction_id", transactionIDQ)
 	}
 
-	var version string
+	var versionQ string
 	if o.Version != nil {
-		version = swag.FormatInt64(*o.Version)
+		versionQ = swag.FormatInt64(*o.Version)
 	}
-	if version != "" {
-		qs.Set("version", version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/transactions/commit_transaction.go b/operations/transactions/commit_transaction.go
index 39ab9bf1..aee9e422 100644
--- a/operations/transactions/commit_transaction.go
+++ b/operations/transactions/commit_transaction.go
@@ -23,7 +23,7 @@ package transactions
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // CommitTransactionHandlerFunc turns a function with the right signature into a commit transaction handler
diff --git a/operations/transactions/commit_transaction_parameters.go b/operations/transactions/commit_transaction_parameters.go
index eade5c77..556e79bd 100644
--- a/operations/transactions/commit_transaction_parameters.go
+++ b/operations/transactions/commit_transaction_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewCommitTransactionParams creates a new CommitTransactionParams object
diff --git a/operations/transactions/commit_transaction_responses.go b/operations/transactions/commit_transaction_responses.go
index 4cffac19..a5d96392 100644
--- a/operations/transactions/commit_transaction_responses.go
+++ b/operations/transactions/commit_transaction_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // CommitTransactionOKCode is the HTTP code returned for type CommitTransactionOK
diff --git a/operations/transactions/commit_transaction_urlbuilder.go b/operations/transactions/commit_transaction_urlbuilder.go
index 928df9bb..776d45dd 100644
--- a/operations/transactions/commit_transaction_urlbuilder.go
+++ b/operations/transactions/commit_transaction_urlbuilder.go
@@ -76,12 +76,12 @@ func (o *CommitTransactionURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var forceReload string
+	var forceReloadQ string
 	if o.ForceReload != nil {
-		forceReload = swag.FormatBool(*o.ForceReload)
+		forceReloadQ = swag.FormatBool(*o.ForceReload)
 	}
-	if forceReload != "" {
-		qs.Set("force_reload", forceReload)
+	if forceReloadQ != "" {
+		qs.Set("force_reload", forceReloadQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/transactions/delete_transaction.go b/operations/transactions/delete_transaction.go
index 85ee8ee5..a7a40be0 100644
--- a/operations/transactions/delete_transaction.go
+++ b/operations/transactions/delete_transaction.go
@@ -23,7 +23,7 @@ package transactions
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // DeleteTransactionHandlerFunc turns a function with the right signature into a delete transaction handler
diff --git a/operations/transactions/delete_transaction_parameters.go b/operations/transactions/delete_transaction_parameters.go
index 8fdfd624..09c67c44 100644
--- a/operations/transactions/delete_transaction_parameters.go
+++ b/operations/transactions/delete_transaction_parameters.go
@@ -25,8 +25,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewDeleteTransactionParams creates a new DeleteTransactionParams object
diff --git a/operations/transactions/delete_transaction_responses.go b/operations/transactions/delete_transaction_responses.go
index 804a25ec..f217589b 100644
--- a/operations/transactions/delete_transaction_responses.go
+++ b/operations/transactions/delete_transaction_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // DeleteTransactionNoContentCode is the HTTP code returned for type DeleteTransactionNoContent
diff --git a/operations/transactions/get_transaction.go b/operations/transactions/get_transaction.go
index 6aa8a71d..951ccfd0 100644
--- a/operations/transactions/get_transaction.go
+++ b/operations/transactions/get_transaction.go
@@ -23,7 +23,7 @@ package transactions
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetTransactionHandlerFunc turns a function with the right signature into a get transaction handler
diff --git a/operations/transactions/get_transaction_parameters.go b/operations/transactions/get_transaction_parameters.go
index 6349dad8..1f3e46d5 100644
--- a/operations/transactions/get_transaction_parameters.go
+++ b/operations/transactions/get_transaction_parameters.go
@@ -25,8 +25,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime/middleware"
-
-	strfmt "github.com/go-openapi/strfmt"
+	"github.com/go-openapi/strfmt"
 )
 
 // NewGetTransactionParams creates a new GetTransactionParams object
diff --git a/operations/transactions/get_transaction_responses.go b/operations/transactions/get_transaction_responses.go
index 05fa1668..ac0aea7d 100644
--- a/operations/transactions/get_transaction_responses.go
+++ b/operations/transactions/get_transaction_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTransactionOKCode is the HTTP code returned for type GetTransactionOK
diff --git a/operations/transactions/get_transactions.go b/operations/transactions/get_transactions.go
index d3781194..fcdbe9fe 100644
--- a/operations/transactions/get_transactions.go
+++ b/operations/transactions/get_transactions.go
@@ -23,7 +23,7 @@ package transactions
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // GetTransactionsHandlerFunc turns a function with the right signature into a get transactions handler
diff --git a/operations/transactions/get_transactions_parameters.go b/operations/transactions/get_transactions_parameters.go
index b903b815..8ce0d6f5 100644
--- a/operations/transactions/get_transactions_parameters.go
+++ b/operations/transactions/get_transactions_parameters.go
@@ -26,9 +26,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewGetTransactionsParams creates a new GetTransactionsParams object
diff --git a/operations/transactions/get_transactions_responses.go b/operations/transactions/get_transactions_responses.go
index 98a57a94..daae7cf5 100644
--- a/operations/transactions/get_transactions_responses.go
+++ b/operations/transactions/get_transactions_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // GetTransactionsOKCode is the HTTP code returned for type GetTransactionsOK
diff --git a/operations/transactions/get_transactions_urlbuilder.go b/operations/transactions/get_transactions_urlbuilder.go
index d4905715..56e61d39 100644
--- a/operations/transactions/get_transactions_urlbuilder.go
+++ b/operations/transactions/get_transactions_urlbuilder.go
@@ -64,12 +64,12 @@ func (o *GetTransactionsURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	var status string
+	var statusQ string
 	if o.Status != nil {
-		status = *o.Status
+		statusQ = *o.Status
 	}
-	if status != "" {
-		qs.Set("status", status)
+	if statusQ != "" {
+		qs.Set("status", statusQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/operations/transactions/start_transaction.go b/operations/transactions/start_transaction.go
index 106f7be5..69d1cb38 100644
--- a/operations/transactions/start_transaction.go
+++ b/operations/transactions/start_transaction.go
@@ -23,7 +23,7 @@ package transactions
 import (
 	"net/http"
 
-	middleware "github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/runtime/middleware"
 )
 
 // StartTransactionHandlerFunc turns a function with the right signature into a start transaction handler
diff --git a/operations/transactions/start_transaction_parameters.go b/operations/transactions/start_transaction_parameters.go
index b7bef040..01596236 100644
--- a/operations/transactions/start_transaction_parameters.go
+++ b/operations/transactions/start_transaction_parameters.go
@@ -26,10 +26,9 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
-
-	strfmt "github.com/go-openapi/strfmt"
 )
 
 // NewStartTransactionParams creates a new StartTransactionParams object
diff --git a/operations/transactions/start_transaction_responses.go b/operations/transactions/start_transaction_responses.go
index 3e86a887..ff59306b 100644
--- a/operations/transactions/start_transaction_responses.go
+++ b/operations/transactions/start_transaction_responses.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/swag"
 
-	"github.com/haproxytech/models"
+	"github.com/haproxytech/models/v2"
 )
 
 // StartTransactionCreatedCode is the HTTP code returned for type StartTransactionCreated
diff --git a/operations/transactions/start_transaction_urlbuilder.go b/operations/transactions/start_transaction_urlbuilder.go
index f8e444d8..0fa92392 100644
--- a/operations/transactions/start_transaction_urlbuilder.go
+++ b/operations/transactions/start_transaction_urlbuilder.go
@@ -66,9 +66,9 @@ func (o *StartTransactionURL) Build() (*url.URL, error) {
 
 	qs := make(url.Values)
 
-	version := swag.FormatInt64(o.Version)
-	if version != "" {
-		qs.Set("version", version)
+	versionQ := swag.FormatInt64(o.Version)
+	if versionQ != "" {
+		qs.Set("version", versionQ)
 	}
 
 	_result.RawQuery = qs.Encode()
diff --git a/server.go b/server.go
index 198be0a6..4d48dd6d 100644
--- a/server.go
+++ b/server.go
@@ -148,7 +148,6 @@ func (s *Server) SetAPI(api *operations.DataPlaneAPI) {
 	}
 
 	s.api = api
-	s.api.Logger = log.Printf
 	s.handler = configureAPI(api)
 }
 
@@ -189,8 +188,6 @@ func (s *Server) Serve() (err error) {
 	go handleInterrupt(once, s)
 
 	servers := []*http.Server{}
-	wg.Add(1)
-	go s.handleShutdown(wg, &servers)
 
 	if s.hasScheme(schemeUnix) {
 		domainSocket := new(http.Server)
@@ -267,7 +264,7 @@ func (s *Server) Serve() (err error) {
 			// https://github.com/golang/go/tree/master/src/crypto/elliptic
 			CurvePreferences: []tls.CurveID{tls.CurveP256},
 			// Use modern tls mode https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
-			NextProtos: []string{"http/1.1", "h2"},
+			NextProtos: []string{"h2", "http/1.1"},
 			// https://www.owasp.org/index.php/Transport_Layer_Protection_Cheat_Sheet#Rule_-_Only_Support_Strong_Protocols
 			MinVersion: tls.VersionTLS12,
 			// These ciphersuites support Forward Secrecy: https://en.wikipedia.org/wiki/Forward_secrecy
@@ -308,7 +305,7 @@ func (s *Server) Serve() (err error) {
 		// call custom TLS configurator
 		configureTLS(httpsServer.TLSConfig)
 
-		if len(httpsServer.TLSConfig.Certificates) == 0 {
+		if len(httpsServer.TLSConfig.Certificates) == 0 && httpsServer.TLSConfig.GetCertificate == nil {
 			// after standard and custom config are passed, this ends up with no certificate
 			if s.TLSCertificate == "" {
 				if s.TLSCertificateKey == "" {
@@ -340,6 +337,9 @@ func (s *Server) Serve() (err error) {
 		}(tls.NewListener(s.httpsServerL, httpsServer.TLSConfig))
 	}
 
+	wg.Add(1)
+	go s.handleShutdown(wg, &servers)
+
 	wg.Wait()
 	return nil
 }
@@ -435,6 +435,9 @@ func (s *Server) handleShutdown(wg *sync.WaitGroup, serversPtr *[]*http.Server)
 	ctx, cancel := context.WithTimeout(context.TODO(), s.GracefulTimeout)
 	defer cancel()
 
+	// first execute the pre-shutdown hook
+	s.api.PreServerShutdown()
+
 	shutdownChan := make(chan bool)
 	for i := range servers {
 		server := servers[i]
@@ -504,7 +507,7 @@ func (s *Server) TLSListener() (net.Listener, error) {
 
 func handleInterrupt(once *sync.Once, s *Server) {
 	once.Do(func() {
-		for _ = range s.interrupt {
+		for range s.interrupt {
 			if s.interrupted {
 				s.Logf("Server already shutting down")
 				continue