diff --git a/composer.json b/composer.json
index 60749c6..155944e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
 {
-    "name": "wikia/docker-php",
+    "name": "fandom/docker-php",
     "description": "PHP client for Docker API generated from Docker's OpenAPI spec",
     "type": "library",
     "require": {
-        "jane-php/open-api-runtime": "^6.0"
+        "jane-php/open-api-runtime": "7.2.2"
     },
     "require-dev": {
-        "jane-php/open-api-2": "^6.0"
+        "jane-php/open-api-2": "7.2.2"
     },
     "autoload": {
        "psr-4": {
diff --git a/composer.lock b/composer.lock
index fb2d4ee..3a9b5e8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,36 +4,36 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "36c8c440bdb940b028c5f476d710cf10",
+    "content-hash": "c9915114fbc70b8b38829d10ffa0d67a",
     "packages": [
         {
             "name": "clue/stream-filter",
-            "version": "v1.4.1",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/clue/php-stream-filter.git",
-                "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71"
+                "url": "https://github.com/clue/stream-filter.git",
+                "reference": "d6169430c7731d8509da7aecd0af756a5747b78e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
-                "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
+                "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e",
+                "reference": "d6169430c7731d8509da7aecd0af756a5747b78e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.0 || ^4.8"
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Clue\\StreamFilter\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "Clue\\StreamFilter\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -42,7 +42,7 @@
             "authors": [
                 {
                     "name": "Christian Lück",
-                    "email": "christian@lueck.tv"
+                    "email": "christian@clue.engineering"
                 }
             ],
             "description": "A simple and modern approach to stream filtering in PHP",
@@ -56,29 +56,43 @@
                 "stream_filter_append",
                 "stream_filter_register"
             ],
-            "time": "2019-04-09T12:31:48+00:00"
+            "support": {
+                "issues": "https://github.com/clue/stream-filter/issues",
+                "source": "https://github.com/clue/stream-filter/tree/v1.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-21T13:15:14+00:00"
         },
         {
             "name": "jane-php/json-schema-runtime",
-            "version": "v6.0.4",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/json-schema-runtime.git",
-                "reference": "ad2589ea564bc6dbf84b5ad1a66a6b81ff7a156c"
+                "reference": "46aed7d2ac26b86e713c45091d18b4a591121143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/janephp/json-schema-runtime/zipball/ad2589ea564bc6dbf84b5ad1a66a6b81ff7a156c",
-                "reference": "ad2589ea564bc6dbf84b5ad1a66a6b81ff7a156c",
+                "url": "https://api.github.com/repos/janephp/json-schema-runtime/zipball/46aed7d2ac26b86e713c45091d18b4a591121143",
+                "reference": "46aed7d2ac26b86e713c45091d18b4a591121143",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "league/uri": "^6.0",
-                "php": ">=7.2",
+                "php": "^7.2 || ^8.0",
                 "php-jsonpointer/php-jsonpointer": "^3.0",
-                "symfony/serializer": "^4.4 || ^5.0",
-                "symfony/yaml": "~4.4.9 || ^5.0"
+                "symfony/serializer": "^4.4 || ^5.0 || ^6.0",
+                "symfony/yaml": "~4.4.9 || ^5.0 || ^6.0"
             },
             "conflict": {
                 "symfony/framework-bundle": "5.1.0"
@@ -89,12 +103,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6-dev"
+                    "dev-next": "7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Jane\\JsonSchemaRuntime\\": ""
+                    "Jane\\Component\\JsonSchemaRuntime\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -115,45 +129,49 @@
                 }
             ],
             "description": "Jane runtime Library",
-            "time": "2020-07-29T16:59:24+00:00"
+            "support": {
+                "source": "https://github.com/janephp/json-schema-runtime/tree/v7.2.2"
+            },
+            "time": "2021-12-16T13:26:58+00:00"
         },
         {
             "name": "jane-php/open-api-runtime",
-            "version": "v6.0.4",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/open-api-runtime.git",
-                "reference": "0b47d99d6666d7b267cb3a5abfc4d2d85af7cada"
+                "reference": "ce5ed462cba12e88e4072769ec7899556c70bb05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/janephp/open-api-runtime/zipball/0b47d99d6666d7b267cb3a5abfc4d2d85af7cada",
-                "reference": "0b47d99d6666d7b267cb3a5abfc4d2d85af7cada",
+                "url": "https://api.github.com/repos/janephp/open-api-runtime/zipball/ce5ed462cba12e88e4072769ec7899556c70bb05",
+                "reference": "ce5ed462cba12e88e4072769ec7899556c70bb05",
                 "shasum": ""
             },
             "require": {
-                "jane-php/json-schema-runtime": "^6.0",
-                "php": ">=7.2",
+                "jane-php/json-schema-runtime": "^7.0",
+                "php": "^7.2 || ^8.0",
                 "php-http/client-common": "^2.0",
+                "php-http/discovery": "^1.6",
                 "php-http/message-factory": "^1.0.2",
                 "php-http/multipart-stream-builder": "^1.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "symfony/options-resolver": "^4.4 || ^5.0"
+                "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^8.0",
-                "symfony/serializer": "^4.4 || ^5.0"
+                "symfony/serializer": "^4.4 || ^5.0 || ^6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6-dev"
+                    "dev-next": "7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Jane\\OpenApiRuntime\\": ""
+                    "Jane\\Component\\OpenApiRuntime\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -174,42 +192,49 @@
                 }
             ],
             "description": "Jane OpenAPI Runtime Library, dependencies and utility class for a library generated by jane/openapi",
-            "time": "2020-07-27T08:03:04+00:00"
+            "support": {
+                "source": "https://github.com/janephp/open-api-runtime/tree/v7.2.2"
+            },
+            "time": "2021-12-16T13:26:58+00:00"
         },
         {
             "name": "league/uri",
-            "version": "6.2.1",
+            "version": "6.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "6998530902550c6e3fefb5ef98d56fe92ecdb603"
+                "reference": "4147f19b9de3b5af6a258f35d7a0efbbf9963298"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/6998530902550c6e3fefb5ef98d56fe92ecdb603",
-                "reference": "6998530902550c6e3fefb5ef98d56fe92ecdb603",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/4147f19b9de3b5af6a258f35d7a0efbbf9963298",
+                "reference": "4147f19b9de3b5af6a258f35d7a0efbbf9963298",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "league/uri-interfaces": "^2.1",
-                "php": "^7.2",
+                "league/uri-interfaces": "^2.3",
+                "php": "^7.4 || ^8.0",
                 "psr/http-message": "^1.0"
             },
             "conflict": {
                 "league/uri-schemes": "^1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.16",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^8.0"
+                "friendsofphp/php-cs-fixer": "^v3.3.2",
+                "php-http/psr7-integration-tests": "^1.1",
+                "phpstan/phpstan": "^1.2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0.0",
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "phpunit/phpunit": "^9.5.10",
+                "psr/http-factory": "^1.0"
             },
             "suggest": {
                 "ext-fileinfo": "Needed to create Data URI from a filepath",
                 "ext-intl": "Needed to improve host validation",
-                "league/uri-components": "Needed to easily manipulate URI objects"
+                "league/uri-components": "Needed to easily manipulate URI objects",
+                "psr/http-factory": "Needed to use the URI factory"
             },
             "type": "library",
             "extra": {
@@ -234,7 +259,7 @@
                 }
             ],
             "description": "URI manipulation library",
-            "homepage": "http://uri.thephpleague.com",
+            "homepage": "https://uri.thephpleague.com",
             "keywords": [
                 "data-uri",
                 "file-uri",
@@ -256,38 +281,48 @@
                 "url",
                 "ws"
             ],
+            "support": {
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri/issues",
+                "source": "https://github.com/thephpleague/uri/tree/6.6.0"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sponsors/nyamsprod",
                     "type": "github"
                 }
             ],
-            "time": "2020-03-17T14:40:17+00:00"
+            "time": "2022-05-28T05:44:35+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "2.1.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "0068a469958895ceaf3afcb489c0258adfa1e406"
+                "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/0068a469958895ceaf3afcb489c0258adfa1e406",
-                "reference": "0068a469958895ceaf3afcb489c0258adfa1e406",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/00e7e2943f76d8cb50c7dfdc2f6dee356e15e383",
+                "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": "^7.1"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^7.0|^8.0"
+                "friendsofphp/php-cs-fixer": "^2.19",
+                "phpstan/phpstan": "^0.12.90",
+                "phpstan/phpstan-phpunit": "^0.12.19",
+                "phpstan/phpstan-strict-rules": "^0.12.9",
+                "phpunit/phpunit": "^8.5.15 || ^9.5"
+            },
+            "suggest": {
+                "ext-intl": "to use the IDNA feature",
+                "symfony/intl": "to use the IDNA feature via Symfony Polyfill"
             },
             "type": "library",
             "extra": {
@@ -319,20 +354,30 @@
                 "uri",
                 "url"
             ],
-            "time": "2020-02-08T12:10:37+00:00"
+            "support": {
+                "issues": "https://github.com/thephpleague/uri-interfaces/issues",
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-06-28T04:27:21+00:00"
         },
         {
             "name": "php-http/client-common",
-            "version": "2.3.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/client-common.git",
-                "reference": "e37e46c610c87519753135fb893111798c69076a"
+                "reference": "d135751167d57e27c74de674d6a30cef2dc8e054"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/client-common/zipball/e37e46c610c87519753135fb893111798c69076a",
-                "reference": "e37e46c610c87519753135fb893111798c69076a",
+                "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054",
+                "reference": "d135751167d57e27c74de674d6a30cef2dc8e054",
                 "shasum": ""
             },
             "require": {
@@ -343,14 +388,14 @@
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
                 "psr/http-message": "^1.0",
-                "symfony/options-resolver": "^2.6 || ^3.4.20 || ~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0",
+                "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0",
                 "symfony/polyfill-php80": "^1.17"
             },
             "require-dev": {
                 "doctrine/instantiator": "^1.1",
                 "guzzlehttp/psr7": "^1.4",
                 "nyholm/psr7": "^1.2",
-                "phpspec/phpspec": "^5.1 || ^6.0",
+                "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1",
                 "phpspec/prophecy": "^1.10.2",
                 "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3"
             },
@@ -390,20 +435,24 @@
                 "http",
                 "httplug"
             ],
-            "time": "2020-07-21T10:04:13+00:00"
+            "support": {
+                "issues": "https://github.com/php-http/client-common/issues",
+                "source": "https://github.com/php-http/client-common/tree/2.5.0"
+            },
+            "time": "2021-11-26T15:01:24+00:00"
         },
         {
             "name": "php-http/discovery",
-            "version": "1.9.1",
+            "version": "1.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/discovery.git",
-                "reference": "64a18cc891957e05d91910b3c717d6bd11fbede9"
+                "reference": "c8d48852fbc052454af42f6de27635ddd916b959"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/discovery/zipball/64a18cc891957e05d91910b3c717d6bd11fbede9",
-                "reference": "64a18cc891957e05d91910b3c717d6bd11fbede9",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/c8d48852fbc052454af42f6de27635ddd916b959",
+                "reference": "c8d48852fbc052454af42f6de27635ddd916b959",
                 "shasum": ""
             },
             "require": {
@@ -416,12 +465,10 @@
                 "graham-campbell/phpspec-skip-example-extension": "^5.0",
                 "php-http/httplug": "^1.0 || ^2.0",
                 "php-http/message-factory": "^1.0",
-                "phpspec/phpspec": "^5.1 || ^6.1",
-                "puli/composer-plugin": "1.0.0-beta10"
+                "phpspec/phpspec": "^5.1 || ^6.1"
             },
             "suggest": {
-                "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories",
-                "puli/composer-plugin": "Sets up Puli which is recommended for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details."
+                "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories"
             },
             "type": "library",
             "extra": {
@@ -455,20 +502,24 @@
                 "message",
                 "psr7"
             ],
-            "time": "2020-07-13T15:44:45+00:00"
+            "support": {
+                "issues": "https://github.com/php-http/discovery/issues",
+                "source": "https://github.com/php-http/discovery/tree/1.14.2"
+            },
+            "time": "2022-05-25T07:26:05+00:00"
         },
         {
             "name": "php-http/httplug",
-            "version": "2.2.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/httplug.git",
-                "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9"
+                "reference": "f640739f80dfa1152533976e3c112477f69274eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/httplug/zipball/191a0a1b41ed026b717421931f8d3bd2514ffbf9",
-                "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb",
+                "reference": "f640739f80dfa1152533976e3c112477f69274eb",
                 "shasum": ""
             },
             "require": {
@@ -513,25 +564,29 @@
                 "client",
                 "http"
             ],
-            "time": "2020-07-13T15:43:23+00:00"
+            "support": {
+                "issues": "https://github.com/php-http/httplug/issues",
+                "source": "https://github.com/php-http/httplug/tree/2.3.0"
+            },
+            "time": "2022-02-21T09:52:22+00:00"
         },
         {
             "name": "php-http/message",
-            "version": "1.8.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/message.git",
-                "reference": "ce8f43ac1e294b54aabf5808515c3554a19c1e1c"
+                "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/message/zipball/ce8f43ac1e294b54aabf5808515c3554a19c1e1c",
-                "reference": "ce8f43ac1e294b54aabf5808515c3554a19c1e1c",
+                "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361",
+                "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361",
                 "shasum": ""
             },
             "require": {
-                "clue/stream-filter": "^1.4",
-                "php": "^7.1",
+                "clue/stream-filter": "^1.5",
+                "php": "^7.1 || ^8.0",
                 "php-http/message-factory": "^1.0.2",
                 "psr/http-message": "^1.0"
             },
@@ -539,34 +594,32 @@
                 "php-http/message-factory-implementation": "1.0"
             },
             "require-dev": {
-                "akeneo/phpspec-skip-example-extension": "^1.0",
-                "coduo/phpspec-data-provider-extension": "^1.0",
+                "ergebnis/composer-normalize": "^2.6",
                 "ext-zlib": "*",
                 "guzzlehttp/psr7": "^1.0",
-                "henrikbjorn/phpspec-code-coverage": "^1.0",
-                "phpspec/phpspec": "^2.4",
-                "slim/slim": "^3.0",
-                "zendframework/zend-diactoros": "^1.0"
+                "laminas/laminas-diactoros": "^2.0",
+                "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1",
+                "slim/slim": "^3.0"
             },
             "suggest": {
                 "ext-zlib": "Used with compressor/decompressor streams",
                 "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories",
-                "slim/slim": "Used with Slim Framework PSR-7 implementation",
-                "zendframework/zend-diactoros": "Used with Diactoros Factories"
+                "laminas/laminas-diactoros": "Used with Diactoros Factories",
+                "slim/slim": "Used with Slim Framework PSR-7 implementation"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.10-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Http\\Message\\": "src/"
-                },
                 "files": [
                     "src/filters.php"
-                ]
+                ],
+                "psr-4": {
+                    "Http\\Message\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -585,7 +638,11 @@
                 "message",
                 "psr-7"
             ],
-            "time": "2019-08-05T06:55:08+00:00"
+            "support": {
+                "issues": "https://github.com/php-http/message/issues",
+                "source": "https://github.com/php-http/message/tree/1.13.0"
+            },
+            "time": "2022-02-11T13:41:14+00:00"
         },
         {
             "name": "php-http/message-factory",
@@ -635,20 +692,24 @@
                 "stream",
                 "uri"
             ],
+            "support": {
+                "issues": "https://github.com/php-http/message-factory/issues",
+                "source": "https://github.com/php-http/message-factory/tree/master"
+            },
             "time": "2015-12-19T14:08:53+00:00"
         },
         {
             "name": "php-http/multipart-stream-builder",
-            "version": "1.1.2",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/multipart-stream-builder.git",
-                "reference": "121299c2aad475a19087bc6298a1c9aa4d5c1ecc"
+                "reference": "11c1d31f72e01c738bbce9e27649a7cca829c30e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/121299c2aad475a19087bc6298a1c9aa4d5c1ecc",
-                "reference": "121299c2aad475a19087bc6298a1c9aa4d5c1ecc",
+                "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/11c1d31f72e01c738bbce9e27649a7cca829c30e",
+                "reference": "11c1d31f72e01c738bbce9e27649a7cca829c30e",
                 "shasum": ""
             },
             "require": {
@@ -666,7 +727,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -693,7 +754,11 @@
                 "multipart stream",
                 "stream"
             ],
-            "time": "2020-07-13T15:48:43+00:00"
+            "support": {
+                "issues": "https://github.com/php-http/multipart-stream-builder/issues",
+                "source": "https://github.com/php-http/multipart-stream-builder/tree/1.2.0"
+            },
+            "time": "2021-05-21T08:32:01+00:00"
         },
         {
             "name": "php-http/promise",
@@ -746,6 +811,10 @@
             "keywords": [
                 "promise"
             ],
+            "support": {
+                "issues": "https://github.com/php-http/promise/issues",
+                "source": "https://github.com/php-http/promise/tree/1.1.0"
+            },
             "time": "2020-07-07T09:29:14+00:00"
         },
         {
@@ -798,6 +867,10 @@
                 "json pointer",
                 "json traversal"
             ],
+            "support": {
+                "issues": "https://github.com/raphaelstolt/php-jsonpointer/issues",
+                "source": "https://github.com/raphaelstolt/php-jsonpointer/tree/master"
+            },
             "time": "2016-08-29T08:51:01+00:00"
         },
         {
@@ -847,6 +920,9 @@
                 "psr",
                 "psr-18"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
             "time": "2020-06-29T06:28:15+00:00"
         },
         {
@@ -899,6 +975,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
             "time": "2019-04-30T12:38:16+00:00"
         },
         {
@@ -949,29 +1028,32 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.1.3",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14",
-                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -999,6 +1081,9 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1013,33 +1098,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-06-06T08:49:21+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.3",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "9ff59517938f88d90b6e65311fef08faa640f681"
+                "reference": "51f7006670febe4cbcbae177cbffe93ff833250d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9ff59517938f88d90b6e65311fef08faa640f681",
-                "reference": "9ff59517938f88d90b6e65311fef08faa640f681",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/51f7006670febe4cbcbae177cbffe93ff833250d",
+                "reference": "51f7006670febe4cbcbae177cbffe93ff833250d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/polyfill-php80": "^1.15"
+                "php": ">=8.0.2",
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\OptionsResolver\\": ""
@@ -1062,13 +1141,16 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony OptionsResolver Component",
+            "description": "Provides an improved replacement for the array_replace PHP function",
             "homepage": "https://symfony.com",
             "keywords": [
                 "config",
                 "configuration",
                 "options"
             ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v6.0.3"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1083,24 +1165,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-12T12:58:00+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -1108,7 +1193,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1116,12 +1201,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1145,6 +1230,9 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1159,29 +1247,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.18.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.8"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1189,12 +1277,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1225,6 +1313,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1239,65 +1330,66 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2022-03-04T08:16:47+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v5.1.3",
+            "version": "v6.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "c977301a898088f483f7a9b479dd050d84ef3fed"
+                "reference": "cd209717fce097ed002a218cbd9be9d56ed53e78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/c977301a898088f483f7a9b479dd050d84ef3fed",
-                "reference": "c977301a898088f483f7a9b479dd050d84ef3fed",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/cd209717fce097ed002a218cbd9be9d56ed53e78",
+                "reference": "cd209717fce097ed002a218cbd9be9d56ed53e78",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-php80": "^1.15"
+                "php": ">=8.0.2",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "phpdocumentor/type-resolver": "<0.2.1",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/property-access": "<4.4",
-                "symfony/property-info": "<4.4",
-                "symfony/yaml": "<4.4"
+                "doctrine/annotations": "<1.12",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/property-access": "<5.4",
+                "symfony/property-info": "<5.4",
+                "symfony/uid": "<5.4",
+                "symfony/yaml": "<5.4"
             },
             "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "doctrine/cache": "~1.0",
-                "phpdocumentor/reflection-docblock": "^3.2|^4.0",
-                "symfony/cache": "^4.4|^5.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-foundation": "^4.4|^5.0",
-                "symfony/mime": "^4.4|^5.0",
-                "symfony/property-access": "^4.4|^5.0",
-                "symfony/property-info": "^4.4|^5.0",
-                "symfony/validator": "^4.4|^5.0",
-                "symfony/yaml": "^4.4|^5.0"
+                "doctrine/annotations": "^1.12",
+                "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/filesystem": "^5.4|^6.0",
+                "symfony/form": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0",
+                "symfony/property-access": "^5.4|^6.0",
+                "symfony/property-info": "^5.4|^6.0",
+                "symfony/uid": "^5.4|^6.0",
+                "symfony/validator": "^5.4|^6.0",
+                "symfony/var-dumper": "^5.4|^6.0",
+                "symfony/var-exporter": "^5.4|^6.0",
+                "symfony/yaml": "^5.4|^6.0"
             },
             "suggest": {
-                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
                 "psr/cache-implementation": "For using the metadata cache.",
                 "symfony/config": "For using the XML mapping loader.",
                 "symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.",
                 "symfony/property-access": "For using the ObjectNormalizer.",
                 "symfony/property-info": "To deserialize relations.",
+                "symfony/var-exporter": "For using the metadata compiler.",
                 "symfony/yaml": "For using the default YAML mapping loader."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Serializer\\": ""
@@ -1320,8 +1412,11 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Serializer Component",
+            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/serializer/tree/v6.0.9"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1336,32 +1431,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-23T08:36:24+00:00"
+            "time": "2022-05-10T09:19:38+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.1.3",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23"
+                "reference": "e77f3ea0b21141d771d4a5655faa54f692b34af5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23",
-                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e77f3ea0b21141d771d4a5655faa54f692b34af5",
+                "reference": "e77f3ea0b21141d771d4a5655faa54f692b34af5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/polyfill-ctype": "~1.8"
+                "php": ">=8.0.2",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/console": "<4.4"
+                "symfony/console": "<5.4"
             },
             "require-dev": {
-                "symfony/console": "^4.4|^5.0"
+                "symfony/console": "^5.4|^6.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
@@ -1370,11 +1464,6 @@
                 "Resources/bin/yaml-lint"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
@@ -1397,8 +1486,11 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Yaml Component",
+            "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v6.0.3"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1413,43 +1505,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "time": "2022-01-26T17:23:29+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/inflector",
-            "version": "1.4.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c"
+                "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/4650c8b30c753a76bf44fb2ed00117d6f367490c",
-                "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+                "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^7.0",
-                "phpstan/phpstan": "^0.11",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-strict-rules": "^0.11",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "doctrine/coding-standard": "^8.2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "vimeo/psalm": "^4.10"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector",
                     "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
                 }
             },
@@ -1493,6 +1580,10 @@
                 "uppercase",
                 "words"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/inflector/issues",
+                "source": "https://github.com/doctrine/inflector/tree/2.0.4"
+            },
             "funding": [
                 {
                     "url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1507,41 +1598,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-29T07:19:59+00:00"
+            "time": "2021-10-22T20:16:43+00:00"
         },
         {
             "name": "jane-php/json-schema",
-            "version": "v6.0.4",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/json-schema.git",
-                "reference": "a027be6134f2d4ec3e193f5eea33e9fd28e12477"
+                "reference": "24d7055f32d607f73fdc5c8328d2da1ce3e76d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/janephp/json-schema/zipball/a027be6134f2d4ec3e193f5eea33e9fd28e12477",
-                "reference": "a027be6134f2d4ec3e193f5eea33e9fd28e12477",
+                "url": "https://api.github.com/repos/janephp/json-schema/zipball/24d7055f32d607f73fdc5c8328d2da1ce3e76d72",
+                "reference": "24d7055f32d607f73fdc5c8328d2da1ce3e76d72",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "^1.0",
+                "doctrine/inflector": "^1.4 || ^2.0",
                 "ext-json": "*",
-                "jane-php/json-schema-runtime": "^6.0",
+                "jane-php/json-schema-runtime": "^7.0",
                 "nikic/php-parser": "^4.0",
-                "php": ">=7.2",
-                "symfony/console": "^4.4 || ^5.0",
-                "symfony/filesystem": "^4.4 || ^5.0",
-                "symfony/options-resolver": "^4.4 || ^5.0",
-                "symfony/serializer": "^4.4 || ^5.0",
-                "symfony/var-dumper": "^4.4 || ^5.0",
-                "symfony/yaml": "~4.4.9 || ^5.0"
+                "php": "^7.2 || ^8.0",
+                "symfony/console": "^4.4 || ^5.0 || ^6.0",
+                "symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
+                "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
+                "symfony/serializer": "^4.4 || ^5.0 || ^6.0",
+                "symfony/validator": "^4.4 || ^5.0 || ^6.0",
+                "symfony/var-dumper": "^4.4 || ^5.0 || ^6.0",
+                "symfony/yaml": "~4.4.9 || ^5.0 || ^6.0"
             },
             "conflict": {
+                "nikic/php-parser": "<4.0.4",
                 "symfony/framework-bundle": "5.1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^8.0",
-                "symfony/finder": "^4.4 || ^5.0"
+                "symfony/finder": "^4.4 || ^5.0 || ^6.0"
             },
             "suggest": {
                 "friendsofphp/php-cs-fixer": "Allow to automatically fix cs on generated code for better visualisation"
@@ -1552,12 +1645,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6-dev"
+                    "dev-next": "7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Jane\\JsonSchema\\": ""
+                    "Jane\\Component\\JsonSchema\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -1578,37 +1671,41 @@
                 }
             ],
             "description": "Generate a serializable / deserializable object model given a json schema",
-            "time": "2020-07-30T08:05:42+00:00"
+            "support": {
+                "source": "https://github.com/janephp/json-schema/tree/v7.2.2"
+            },
+            "time": "2022-03-05T15:01:16+00:00"
         },
         {
             "name": "jane-php/open-api-2",
-            "version": "v6.0.4",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/open-api-2.git",
-                "reference": "5d8a8fe8b726e07bee6bf683a408917b0c52b3e1"
+                "reference": "5c357b235dab348fc3b3f8ccc03c324f6992d392"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/janephp/open-api-2/zipball/5d8a8fe8b726e07bee6bf683a408917b0c52b3e1",
-                "reference": "5d8a8fe8b726e07bee6bf683a408917b0c52b3e1",
+                "url": "https://api.github.com/repos/janephp/open-api-2/zipball/5c357b235dab348fc3b3f8ccc03c324f6992d392",
+                "reference": "5c357b235dab348fc3b3f8ccc03c324f6992d392",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "jane-php/json-schema": "^6.0",
-                "jane-php/open-api-common": "^6.0",
+                "jane-php/json-schema": "^7.0",
+                "jane-php/open-api-common": "^7.0",
                 "nikic/php-parser": "^4.0",
-                "php": ">=7.2",
-                "symfony/serializer": "^4.4 || ^5.0",
-                "symfony/yaml": "~4.4.9 || ^5.0"
+                "php": "^7.2 || ^8.0",
+                "symfony/serializer": "^4.4 || ^5.0 || ^6.0",
+                "symfony/yaml": "~4.4.9 || ^5.0 || ^6.0"
             },
             "conflict": {
+                "nikic/php-parser": "<4.0.4",
                 "symfony/framework-bundle": "5.1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^8.0",
-                "symfony/finder": "^4.4 || ^5.0"
+                "symfony/finder": "^4.4 || ^5.0 || ^6.0"
             },
             "suggest": {
                 "friendsofphp/php-cs-fixer": "To have a nice formatting of the generated files"
@@ -1616,12 +1713,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6-dev"
+                    "dev-next": "7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Jane\\OpenApi2\\": ""
+                    "Jane\\Component\\OpenApi2\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -1647,32 +1744,35 @@
                 "openapi",
                 "swagger"
             ],
-            "time": "2020-07-30T08:05:42+00:00"
+            "support": {
+                "source": "https://github.com/janephp/open-api-2/tree/v7.2.2"
+            },
+            "time": "2022-03-05T15:01:16+00:00"
         },
         {
             "name": "jane-php/open-api-common",
-            "version": "v6.0.4",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/open-api-common.git",
-                "reference": "cb04ee6753bb5a90c1dcad2845cfd6688f8b2d1a"
+                "reference": "83ddf3b41c2f2e6fd9003da039d3ed53f3351b2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/janephp/open-api-common/zipball/cb04ee6753bb5a90c1dcad2845cfd6688f8b2d1a",
-                "reference": "cb04ee6753bb5a90c1dcad2845cfd6688f8b2d1a",
+                "url": "https://api.github.com/repos/janephp/open-api-common/zipball/83ddf3b41c2f2e6fd9003da039d3ed53f3351b2a",
+                "reference": "83ddf3b41c2f2e6fd9003da039d3ed53f3351b2a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "jane-php/json-schema": "^6.0",
-                "jane-php/open-api-runtime": "^6.0",
-                "php": ">=7.2",
-                "symfony/console": "^4.4 || ^5.0",
-                "symfony/filesystem": "^4.4 || ^5.0",
-                "symfony/string": "^5.0",
+                "jane-php/json-schema": "^7.0",
+                "jane-php/open-api-runtime": "^7.0",
+                "php": "^7.2 || ^8.0",
+                "symfony/console": "^4.4 || ^5.0 || ^6.0",
+                "symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
+                "symfony/string": "^5.0 || ^6.0",
                 "symfony/translation-contracts": "^2.0",
-                "symfony/var-dumper": "^4.4 || ^5.0"
+                "symfony/var-dumper": "^4.4 || ^5.0 || ^6.0"
             },
             "suggest": {
                 "jane-php/open-api-2": "Allow to generate OpenApi v2 clients",
@@ -1684,12 +1784,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6-dev"
+                    "dev-next": "7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Jane\\OpenApiCommon\\": ""
+                    "Jane\\Component\\OpenApiCommon\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1713,20 +1813,23 @@
                 "swagger",
                 "utility"
             ],
-            "time": "2020-07-30T07:40:07+00:00"
+            "support": {
+                "source": "https://github.com/janephp/open-api-common/tree/v7.2.2"
+            },
+            "time": "2022-02-15T17:29:06+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.7.0",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
-                "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
@@ -1734,8 +1837,8 @@
                 "php": ">=7.0"
             },
             "require-dev": {
-                "ircmaxell/php-yacc": "0.0.5",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1743,7 +1846,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.7-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
@@ -1765,29 +1868,33 @@
                 "parser",
                 "php"
             ],
-            "time": "2020-07-25T13:18:53+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+            },
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -1802,7 +1909,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -1814,48 +1921,50 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.1.3",
+            "version": "v6.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2226c68009627934b8cfc01260b4d287eab070df"
+                "reference": "9b190bc7a19d19add1dbb3382721973836e59b50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2226c68009627934b8cfc01260b4d287eab070df",
-                "reference": "2226c68009627934b8cfc01260b4d287eab070df",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9b190bc7a19d19add1dbb3382721973836e59b50",
+                "reference": "9b190bc7a19d19add1dbb3382721973836e59b50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.8",
-                "symfony/polyfill-php80": "^1.15",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/string": "^5.1"
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.4|^6.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^4.4|^5.0",
-                "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "symfony/var-dumper": "^4.4|^5.0"
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/lock": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/var-dumper": "^5.4|^6.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -1864,11 +1973,6 @@
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Console\\": ""
@@ -1891,8 +1995,17 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v6.0.9"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1907,32 +2020,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-06T13:23:11+00:00"
+            "time": "2022-05-27T06:40:13+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.3",
+            "version": "v6.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
+                "reference": "bf7b9d2ee692b6df2a41017d6023a2fe732d240c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
-                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf7b9d2ee692b6df2a41017d6023a2fe732d240c",
+                "reference": "bf7b9d2ee692b6df2a41017d6023a2fe732d240c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-ctype": "~1.8"
+                "php": ">=8.0.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Filesystem\\": ""
@@ -1955,8 +2064,11 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Filesystem Component",
+            "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v6.0.9"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1971,24 +2083,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-30T20:35:19+00:00"
+            "time": "2022-05-21T13:33:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.18.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5"
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5",
-                "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -1996,7 +2108,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2004,12 +2116,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2035,6 +2147,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2049,24 +2164,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-11-23T21:10:46+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.18.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -2074,7 +2189,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2082,12 +2197,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2116,6 +2231,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2130,24 +2248,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -2155,7 +2276,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2163,12 +2284,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2193,6 +2314,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2207,29 +2331,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-11-30T18:21:41+00:00"
         },
         {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.18.1",
+            "name": "symfony/polyfill-php81",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2237,12 +2361,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2261,7 +2385,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -2269,6 +2393,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2283,25 +2410,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-09-13T13:58:11+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.1.3",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
+                "reference": "e517458f278c2131ca9f262f8fbaf01410f2c65c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
-                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e517458f278c2131ca9f262f8fbaf01410f2c65c",
+                "reference": "e517458f278c2131ca9f262f8fbaf01410f2c65c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.0"
+                "php": ">=8.0.2",
+                "psr/container": "^2.0"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -2309,7 +2439,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -2345,6 +2475,9 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.0.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2359,49 +2492,46 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-06T13:23:11+00:00"
+            "time": "2022-03-13T20:10:05+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.1.3",
+            "version": "v6.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b"
+                "reference": "df9f03d595aa2d446498ba92fe803a519b2c43cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f629ba9b611c76224feb21fe2bcbf0b6f992300b",
-                "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/df9f03d595aa2d446498ba92fe803a519b2c43cc",
+                "reference": "df9f03d595aa2d446498ba92fe803a519b2c43cc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-client": "^4.4|^5.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0"
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -2420,7 +2550,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony String component",
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
             "homepage": "https://symfony.com",
             "keywords": [
                 "grapheme",
@@ -2430,6 +2560,9 @@
                 "utf-8",
                 "utf8"
             ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v6.0.9"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2444,20 +2577,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-08T08:27:49+00:00"
+            "time": "2022-04-22T08:18:02+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v2.1.3",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63"
+                "reference": "1211df0afa701e45a04253110e959d4af4ef0f07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/616a9773c853097607cf9dd6577d5b143ffdcd63",
-                "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07",
+                "reference": "1211df0afa701e45a04253110e959d4af4ef0f07",
                 "shasum": ""
             },
             "require": {
@@ -2469,7 +2602,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -2505,6 +2638,9 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2519,36 +2655,144 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-06T13:23:11+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/validator",
+            "version": "v6.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/validator.git",
+                "reference": "d8f47eea936014e9e9d1cd3248f8c73d57dc248b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/d8f47eea936014e9e9d1cd3248f8c73d57dc248b",
+                "reference": "d8f47eea936014e9e9d1cd3248f8c73d57dc248b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php81": "^1.22",
+                "symfony/translation-contracts": "^1.1|^2|^3"
+            },
+            "conflict": {
+                "doctrine/annotations": "<1.13",
+                "doctrine/lexer": "<1.1",
+                "phpunit/phpunit": "<5.4.3",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/expression-language": "<5.4",
+                "symfony/http-kernel": "<5.4",
+                "symfony/intl": "<5.4",
+                "symfony/property-info": "<5.4",
+                "symfony/translation": "<5.4",
+                "symfony/yaml": "<5.4"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.13",
+                "egulias/email-validator": "^2.1.10|^3",
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/intl": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0",
+                "symfony/property-access": "^5.4|^6.0",
+                "symfony/property-info": "^5.4|^6.0",
+                "symfony/translation": "^5.4|^6.0",
+                "symfony/yaml": "^5.4|^6.0"
+            },
+            "suggest": {
+                "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "psr/cache-implementation": "For using the mapping cache.",
+                "symfony/config": "",
+                "symfony/expression-language": "For using the Expression validator and the ExpressionLanguageSyntax constraints",
+                "symfony/http-foundation": "",
+                "symfony/intl": "",
+                "symfony/property-access": "For accessing properties within comparison constraints",
+                "symfony/property-info": "To automatically add NotNull and Type constraints",
+                "symfony/translation": "For translating validation errors.",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Validator\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools to validate values",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/validator/tree/v6.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-15T08:07:58+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.1.3",
+            "version": "v6.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a"
+                "reference": "ac81072464221e73ee994d12f0b8a2af4a9ed798"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2ebe1c7bb52052624d6dc1250f4abe525655d75a",
-                "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ac81072464221e73ee994d12f0b8a2af4a9ed798",
+                "reference": "ac81072464221e73ee994d12f0b8a2af4a9ed798",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.15"
+                "php": ">=8.0.2",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
                 "phpunit/phpunit": "<5.4.3",
-                "symfony/console": "<4.4"
+                "symfony/console": "<5.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "twig/twig": "^2.4|^3.0"
+                "symfony/console": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/uid": "^5.4|^6.0",
+                "twig/twig": "^2.13|^3.0.4"
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@@ -2559,11 +2803,6 @@
                 "Resources/bin/var-dump-server"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "Resources/functions/dump.php"
@@ -2589,12 +2828,15 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony mechanism for exploring and dumping PHP variables",
+            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
             "homepage": "https://symfony.com",
             "keywords": [
                 "debug",
                 "dump"
             ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v6.0.9"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2609,7 +2851,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-06-24T13:36:18+00:00"
+            "time": "2022-05-21T13:33:31+00:00"
         }
     ],
     "aliases": [],
@@ -2619,5 +2861,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/src/Client.php b/src/Client.php
index da31382..d802ec7 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api;
 
-class Client extends \Jane\OpenApiRuntime\Client\Psr18Client
+class Client extends \Docker\Api\Runtime\Client\Client
 {
     /**
     * Returns a list of containers. For details on the format, see the
@@ -52,7 +52,7 @@ class Client extends \Jane\OpenApiRuntime\Client\Psr18Client
     */
     public function containerList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerList($queryParameters), $fetch);
     }
     /**
     * 
@@ -73,7 +73,7 @@ public function containerList(array $queryParameters = array(), string $fetch =
     */
     public function containerCreate(\Docker\Api\Model\ContainersCreatePostBody $body, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerCreate($body, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerCreate($body, $queryParameters), $fetch);
     }
     /**
      * Return low-level information about a container.
@@ -90,7 +90,7 @@ public function containerCreate(\Docker\Api\Model\ContainersCreatePostBody $body
      */
     public function containerInspect(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerInspect($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerInspect($id, $queryParameters), $fetch);
     }
     /**
     * On Unix systems, this is done by running the `ps` command. This endpoint
@@ -109,7 +109,7 @@ public function containerInspect(string $id, array $queryParameters = array(), s
     */
     public function containerTop(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerTop($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerTop($id, $queryParameters), $fetch);
     }
     /**
     * Get `stdout` and `stderr` logs from a container.
@@ -138,7 +138,7 @@ public function containerTop(string $id, array $queryParameters = array(), strin
     */
     public function containerLogs(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerLogs($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerLogs($id, $queryParameters), $fetch);
     }
     /**
     * Returns which files in a container's filesystem have been added, deleted,
@@ -158,7 +158,7 @@ public function containerLogs(string $id, array $queryParameters = array(), stri
     */
     public function containerChanges(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerChanges($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerChanges($id), $fetch);
     }
     /**
      * Export the contents of a container as a tarball.
@@ -172,7 +172,7 @@ public function containerChanges(string $id, string $fetch = self::FETCH_OBJECT)
      */
     public function containerExport(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerExport($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerExport($id), $fetch);
     }
     /**
     * This endpoint returns a live stream of a container’s resource usage
@@ -211,7 +211,7 @@ public function containerExport(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function containerStats(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerStats($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerStats($id, $queryParameters), $fetch);
     }
     /**
      * Resize the TTY for a container.
@@ -229,7 +229,7 @@ public function containerStats(string $id, array $queryParameters = array(), str
      */
     public function containerResize(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerResize($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerResize($id, $queryParameters), $fetch);
     }
     /**
     * 
@@ -249,7 +249,7 @@ public function containerResize(string $id, array $queryParameters = array(), st
     */
     public function containerStart(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerStart($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerStart($id, $queryParameters), $fetch);
     }
     /**
      * 
@@ -266,7 +266,7 @@ public function containerStart(string $id, array $queryParameters = array(), str
      */
     public function containerStop(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerStop($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerStop($id, $queryParameters), $fetch);
     }
     /**
      * 
@@ -283,7 +283,7 @@ public function containerStop(string $id, array $queryParameters = array(), stri
      */
     public function containerRestart(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerRestart($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerRestart($id, $queryParameters), $fetch);
     }
     /**
     * Send a POSIX signal to a container, defaulting to killing to the
@@ -303,7 +303,7 @@ public function containerRestart(string $id, array $queryParameters = array(), s
     */
     public function containerKill(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerKill($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerKill($id, $queryParameters), $fetch);
     }
     /**
     * Change various configuration options of a container without having to
@@ -320,7 +320,7 @@ public function containerKill(string $id, array $queryParameters = array(), stri
     */
     public function containerUpdate(string $id, \Docker\Api\Model\ContainersIdUpdatePostBody $update, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerUpdate($id, $update), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerUpdate($id, $update), $fetch);
     }
     /**
      * 
@@ -338,7 +338,7 @@ public function containerUpdate(string $id, \Docker\Api\Model\ContainersIdUpdate
      */
     public function containerRename(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerRename($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerRename($id, $queryParameters), $fetch);
     }
     /**
     * Use the freezer cgroup to suspend all processes in a container.
@@ -358,7 +358,7 @@ public function containerRename(string $id, array $queryParameters = array(), st
     */
     public function containerPause(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerPause($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerPause($id), $fetch);
     }
     /**
      * Resume a container which has been paused.
@@ -372,7 +372,7 @@ public function containerPause(string $id, string $fetch = self::FETCH_OBJECT)
      */
     public function containerUnpause(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerUnpause($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerUnpause($id), $fetch);
     }
     /**
     * Attach to a container to read its output or send it input. You can attach
@@ -500,7 +500,7 @@ public function containerUnpause(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function containerAttach(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerAttach($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerAttach($id, $queryParameters), $fetch);
     }
     /**
     * 
@@ -526,7 +526,7 @@ public function containerAttach(string $id, array $queryParameters = array(), st
     */
     public function containerAttachWebsocket(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerAttachWebsocket($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerAttachWebsocket($id, $queryParameters), $fetch);
     }
     /**
     * Block until a container stops, then returns the exit code.
@@ -545,7 +545,7 @@ public function containerAttachWebsocket(string $id, array $queryParameters = ar
     */
     public function containerWait(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerWait($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerWait($id, $queryParameters), $fetch);
     }
     /**
      * 
@@ -566,7 +566,7 @@ public function containerWait(string $id, array $queryParameters = array(), stri
      */
     public function containerDelete(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerDelete($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerDelete($id, $queryParameters), $fetch);
     }
     /**
      * Get a tar archive of a resource in the filesystem of container id.
@@ -584,7 +584,7 @@ public function containerDelete(string $id, array $queryParameters = array(), st
      */
     public function containerArchive(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerArchive($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerArchive($id, $queryParameters), $fetch);
     }
     /**
     * A response header `X-Docker-Container-Path-Stat` is returned, containing
@@ -605,7 +605,7 @@ public function containerArchive(string $id, array $queryParameters = array(), s
     */
     public function containerArchiveInfo(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerArchiveInfo($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerArchiveInfo($id, $queryParameters), $fetch);
     }
     /**
     * Upload a tar archive to be extracted to a path in the filesystem of container id.
@@ -635,7 +635,7 @@ public function containerArchiveInfo(string $id, array $queryParameters = array(
     */
     public function putContainerArchive(string $id, $inputStream, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PutContainerArchive($id, $inputStream, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PutContainerArchive($id, $inputStream, $queryParameters), $fetch);
     }
     /**
     * 
@@ -655,7 +655,7 @@ public function putContainerArchive(string $id, $inputStream, array $queryParame
     */
     public function containerPrune(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerPrune($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerPrune($queryParameters), $fetch);
     }
     /**
     * Returns a list of images on the server. Note that it uses a different, smaller representation of an image than inspecting a single image.
@@ -682,7 +682,7 @@ public function containerPrune(array $queryParameters = array(), string $fetch =
     */
     public function imageList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageList($queryParameters), $fetch);
     }
     /**
     * Build an image from a tar archive with a `Dockerfile` in it.
@@ -760,7 +760,7 @@ public function imageList(array $queryParameters = array(), string $fetch = self
     */
     public function imageBuild($inputStream, array $queryParameters = array(), array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageBuild($inputStream, $queryParameters, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageBuild($inputStream, $queryParameters, $headerParameters), $fetch);
     }
     /**
     * 
@@ -790,7 +790,7 @@ public function imageBuild($inputStream, array $queryParameters = array(), array
     */
     public function buildPrune(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\BuildPrune($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\BuildPrune($queryParameters), $fetch);
     }
     /**
     * Create an image by either pulling it from a registry or importing it.
@@ -819,7 +819,7 @@ public function buildPrune(array $queryParameters = array(), string $fetch = sel
     */
     public function imageCreate(string $inputImage, array $queryParameters = array(), array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageCreate($inputImage, $queryParameters, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageCreate($inputImage, $queryParameters, $headerParameters), $fetch);
     }
     /**
      * Return low-level information about an image.
@@ -833,7 +833,7 @@ public function imageCreate(string $inputImage, array $queryParameters = array()
      */
     public function imageInspect(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageInspect($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageInspect($name), $fetch);
     }
     /**
      * Return parent layers of an image.
@@ -847,7 +847,7 @@ public function imageInspect(string $name, string $fetch = self::FETCH_OBJECT)
      */
     public function imageHistory(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageHistory($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageHistory($name), $fetch);
     }
     /**
     * Push an image to a registry.
@@ -878,7 +878,7 @@ public function imageHistory(string $name, string $fetch = self::FETCH_OBJECT)
     */
     public function imagePush(string $name, array $queryParameters = array(), array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImagePush($name, $queryParameters, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImagePush($name, $queryParameters, $headerParameters), $fetch);
     }
     /**
      * Tag an image so that it becomes part of a repository.
@@ -898,7 +898,7 @@ public function imagePush(string $name, array $queryParameters = array(), array
      */
     public function imageTag(string $name, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageTag($name, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageTag($name, $queryParameters), $fetch);
     }
     /**
     * Remove an image, along with any untagged parent images that were
@@ -922,7 +922,7 @@ public function imageTag(string $name, array $queryParameters = array(), string
     */
     public function imageDelete(string $name, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageDelete($name, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageDelete($name, $queryParameters), $fetch);
     }
     /**
     * Search for an image on Docker Hub.
@@ -944,7 +944,7 @@ public function imageDelete(string $name, array $queryParameters = array(), stri
     */
     public function imageSearch(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageSearch($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageSearch($queryParameters), $fetch);
     }
     /**
     * 
@@ -966,7 +966,7 @@ public function imageSearch(array $queryParameters = array(), string $fetch = se
     */
     public function imagePrune(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImagePrune($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImagePrune($queryParameters), $fetch);
     }
     /**
     * Validate credentials for a registry and, if available, get an identity
@@ -981,7 +981,7 @@ public function imagePrune(array $queryParameters = array(), string $fetch = sel
     */
     public function systemAuth(\Docker\Api\Model\AuthConfig $authConfig, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemAuth($authConfig), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemAuth($authConfig), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -991,7 +991,7 @@ public function systemAuth(\Docker\Api\Model\AuthConfig $authConfig, string $fet
      */
     public function systemInfo(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemInfo(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemInfo(), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -1001,7 +1001,7 @@ public function systemInfo(string $fetch = self::FETCH_OBJECT)
      */
     public function systemVersion(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemVersion(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemVersion(), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -1011,7 +1011,7 @@ public function systemVersion(string $fetch = self::FETCH_OBJECT)
      */
     public function systemPing(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemPing(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemPing(), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -1021,7 +1021,7 @@ public function systemPing(string $fetch = self::FETCH_OBJECT)
      */
     public function systemPingHead(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemPingHead(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemPingHead(), $fetch);
     }
     /**
      * 
@@ -1044,7 +1044,7 @@ public function systemPingHead(string $fetch = self::FETCH_OBJECT)
      */
     public function imageCommit(\Docker\Api\Model\ContainerConfig $containerConfig, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageCommit($containerConfig, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageCommit($containerConfig, $queryParameters), $fetch);
     }
     /**
     * Stream real-time events from the server.
@@ -1099,7 +1099,7 @@ public function imageCommit(\Docker\Api\Model\ContainerConfig $containerConfig,
     */
     public function systemEvents(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemEvents($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemEvents($queryParameters), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -1109,7 +1109,7 @@ public function systemEvents(array $queryParameters = array(), string $fetch = s
      */
     public function systemDataUsage(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SystemDataUsage(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SystemDataUsage(), $fetch);
     }
     /**
     * Get a tarball containing all images and metadata for a repository.
@@ -1145,7 +1145,7 @@ public function systemDataUsage(string $fetch = self::FETCH_OBJECT)
     */
     public function imageGet(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageGet($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageGet($name), $fetch);
     }
     /**
     * Get a tarball containing all images and metadata for several image
@@ -1170,7 +1170,7 @@ public function imageGet(string $name, string $fetch = self::FETCH_OBJECT)
     */
     public function imageGetAll(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageGetAll($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageGetAll($queryParameters), $fetch);
     }
     /**
     * Load a set of images and tags into a repository.
@@ -1189,7 +1189,7 @@ public function imageGetAll(array $queryParameters = array(), string $fetch = se
     */
     public function imageLoad($imagesTarball, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ImageLoad($imagesTarball, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ImageLoad($imagesTarball, $queryParameters), $fetch);
     }
     /**
      * Run a command inside a running container.
@@ -1205,7 +1205,7 @@ public function imageLoad($imagesTarball, array $queryParameters = array(), stri
      */
     public function containerExec(string $id, \Docker\Api\Model\ContainersIdExecPostBody $execConfig, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ContainerExec($id, $execConfig), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ContainerExec($id, $execConfig), $fetch);
     }
     /**
     * Starts a previously set up exec instance. If detach is true, this endpoint
@@ -1223,7 +1223,7 @@ public function containerExec(string $id, \Docker\Api\Model\ContainersIdExecPost
     */
     public function execStart(string $id, \Docker\Api\Model\ExecIdStartPostBody $execStartConfig, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ExecStart($id, $execStartConfig), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ExecStart($id, $execStartConfig), $fetch);
     }
     /**
     * Resize the TTY session used by an exec instance. This endpoint only works
@@ -1242,7 +1242,7 @@ public function execStart(string $id, \Docker\Api\Model\ExecIdStartPostBody $exe
     */
     public function execResize(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ExecResize($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ExecResize($id, $queryParameters), $fetch);
     }
     /**
      * Return low-level information about an exec instance.
@@ -1256,7 +1256,7 @@ public function execResize(string $id, array $queryParameters = array(), string
      */
     public function execInspect(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ExecInspect($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ExecInspect($id), $fetch);
     }
     /**
     * 
@@ -1282,7 +1282,7 @@ public function execInspect(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function volumeList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\VolumeList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\VolumeList($queryParameters), $fetch);
     }
     /**
      * 
@@ -1295,7 +1295,7 @@ public function volumeList(array $queryParameters = array(), string $fetch = sel
      */
     public function volumeCreate(\Docker\Api\Model\VolumesCreatePostBody $volumeConfig, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\VolumeCreate($volumeConfig), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\VolumeCreate($volumeConfig), $fetch);
     }
     /**
      * Instruct the driver to remove the volume.
@@ -1313,7 +1313,7 @@ public function volumeCreate(\Docker\Api\Model\VolumesCreatePostBody $volumeConf
      */
     public function volumeDelete(string $name, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\VolumeDelete($name, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\VolumeDelete($name, $queryParameters), $fetch);
     }
     /**
      * 
@@ -1327,7 +1327,7 @@ public function volumeDelete(string $name, array $queryParameters = array(), str
      */
     public function volumeInspect(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\VolumeInspect($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\VolumeInspect($name), $fetch);
     }
     /**
     * 
@@ -1346,7 +1346,7 @@ public function volumeInspect(string $name, string $fetch = self::FETCH_OBJECT)
     */
     public function volumePrune(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\VolumePrune($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\VolumePrune($queryParameters), $fetch);
     }
     /**
     * Returns a list of networks. For details on the format, see the
@@ -1382,7 +1382,7 @@ public function volumePrune(array $queryParameters = array(), string $fetch = se
     */
     public function networkList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkList($queryParameters), $fetch);
     }
     /**
      * 
@@ -1397,7 +1397,7 @@ public function networkList(array $queryParameters = array(), string $fetch = se
      */
     public function networkDelete(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkDelete($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkDelete($id), $fetch);
     }
     /**
      * 
@@ -1415,7 +1415,7 @@ public function networkDelete(string $id, string $fetch = self::FETCH_OBJECT)
      */
     public function networkInspect(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkInspect($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkInspect($id, $queryParameters), $fetch);
     }
     /**
      * 
@@ -1430,7 +1430,7 @@ public function networkInspect(string $id, array $queryParameters = array(), str
      */
     public function networkCreate(\Docker\Api\Model\NetworksCreatePostBody $networkConfig, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkCreate($networkConfig), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkCreate($networkConfig), $fetch);
     }
     /**
      * 
@@ -1446,7 +1446,7 @@ public function networkCreate(\Docker\Api\Model\NetworksCreatePostBody $networkC
      */
     public function networkConnect(string $id, \Docker\Api\Model\NetworksIdConnectPostBody $container, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkConnect($id, $container), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkConnect($id, $container), $fetch);
     }
     /**
      * 
@@ -1462,7 +1462,7 @@ public function networkConnect(string $id, \Docker\Api\Model\NetworksIdConnectPo
      */
     public function networkDisconnect(string $id, \Docker\Api\Model\NetworksIdDisconnectPostBody $container, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkDisconnect($id, $container), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkDisconnect($id, $container), $fetch);
     }
     /**
     * 
@@ -1482,7 +1482,7 @@ public function networkDisconnect(string $id, \Docker\Api\Model\NetworksIdDiscon
     */
     public function networkPrune(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NetworkPrune($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NetworkPrune($queryParameters), $fetch);
     }
     /**
     * Returns information about installed plugins.
@@ -1504,7 +1504,7 @@ public function networkPrune(array $queryParameters = array(), string $fetch = s
     */
     public function pluginList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginList($queryParameters), $fetch);
     }
     /**
     * 
@@ -1521,7 +1521,7 @@ public function pluginList(array $queryParameters = array(), string $fetch = sel
     */
     public function getPluginPrivileges(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\GetPluginPrivileges($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\GetPluginPrivileges($queryParameters), $fetch);
     }
     /**
     * Pulls and installs a plugin. After the plugin is installed, it can be
@@ -1554,7 +1554,7 @@ public function getPluginPrivileges(array $queryParameters = array(), string $fe
     */
     public function pluginPull(array $body, array $queryParameters = array(), array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginPull($body, $queryParameters, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginPull($body, $queryParameters, $headerParameters), $fetch);
     }
     /**
     * 
@@ -1570,7 +1570,7 @@ public function pluginPull(array $body, array $queryParameters = array(), array
     */
     public function pluginInspect(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginInspect($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginInspect($name), $fetch);
     }
     /**
     * 
@@ -1591,7 +1591,7 @@ public function pluginInspect(string $name, string $fetch = self::FETCH_OBJECT)
     */
     public function pluginDelete(string $name, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginDelete($name, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginDelete($name, $queryParameters), $fetch);
     }
     /**
     * 
@@ -1610,7 +1610,7 @@ public function pluginDelete(string $name, array $queryParameters = array(), str
     */
     public function pluginEnable(string $name, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginEnable($name, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginEnable($name, $queryParameters), $fetch);
     }
     /**
     * 
@@ -1626,7 +1626,7 @@ public function pluginEnable(string $name, array $queryParameters = array(), str
     */
     public function pluginDisable(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginDisable($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginDisable($name), $fetch);
     }
     /**
     * 
@@ -1657,7 +1657,7 @@ public function pluginDisable(string $name, string $fetch = self::FETCH_OBJECT)
     */
     public function pluginUpgrade(string $name, array $body, array $queryParameters = array(), array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginUpgrade($name, $body, $queryParameters, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginUpgrade($name, $body, $queryParameters, $headerParameters), $fetch);
     }
     /**
     * 
@@ -1675,7 +1675,7 @@ public function pluginUpgrade(string $name, array $body, array $queryParameters
     */
     public function pluginCreate($tarContext, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginCreate($tarContext, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginCreate($tarContext, $queryParameters), $fetch);
     }
     /**
     * Push a plugin to the registry.
@@ -1692,7 +1692,7 @@ public function pluginCreate($tarContext, array $queryParameters = array(), stri
     */
     public function pluginPush(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginPush($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginPush($name), $fetch);
     }
     /**
     * 
@@ -1709,7 +1709,7 @@ public function pluginPush(string $name, string $fetch = self::FETCH_OBJECT)
     */
     public function pluginSet(string $name, array $body, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\PluginSet($name, $body), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\PluginSet($name, $body), $fetch);
     }
     /**
     * 
@@ -1734,7 +1734,7 @@ public function pluginSet(string $name, array $body, string $fetch = self::FETCH
     */
     public function nodeList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NodeList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NodeList($queryParameters), $fetch);
     }
     /**
      * 
@@ -1752,7 +1752,7 @@ public function nodeList(array $queryParameters = array(), string $fetch = self:
      */
     public function nodeDelete(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NodeDelete($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NodeDelete($id, $queryParameters), $fetch);
     }
     /**
      * 
@@ -1767,7 +1767,7 @@ public function nodeDelete(string $id, array $queryParameters = array(), string
      */
     public function nodeInspect(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NodeInspect($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NodeInspect($id), $fetch);
     }
     /**
     * 
@@ -1789,7 +1789,7 @@ public function nodeInspect(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function nodeUpdate(string $id, \Docker\Api\Model\NodeSpec $body, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\NodeUpdate($id, $body, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\NodeUpdate($id, $body, $queryParameters), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -1801,7 +1801,7 @@ public function nodeUpdate(string $id, \Docker\Api\Model\NodeSpec $body, array $
      */
     public function swarmInspect(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmInspect(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmInspect(), $fetch);
     }
     /**
      * 
@@ -1816,7 +1816,7 @@ public function swarmInspect(string $fetch = self::FETCH_OBJECT)
      */
     public function swarmInit(\Docker\Api\Model\SwarmInitPostBody $body, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmInit($body), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmInit($body), $fetch);
     }
     /**
      * 
@@ -1831,7 +1831,7 @@ public function swarmInit(\Docker\Api\Model\SwarmInitPostBody $body, string $fet
      */
     public function swarmJoin(\Docker\Api\Model\SwarmJoinPostBody $body, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmJoin($body), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmJoin($body), $fetch);
     }
     /**
     * 
@@ -1849,7 +1849,7 @@ public function swarmJoin(\Docker\Api\Model\SwarmJoinPostBody $body, string $fet
     */
     public function swarmLeave(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmLeave($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmLeave($queryParameters), $fetch);
     }
     /**
     * 
@@ -1872,7 +1872,7 @@ public function swarmLeave(array $queryParameters = array(), string $fetch = sel
     */
     public function swarmUpdate(\Docker\Api\Model\SwarmSpec $body, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmUpdate($body, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmUpdate($body, $queryParameters), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -1883,7 +1883,7 @@ public function swarmUpdate(\Docker\Api\Model\SwarmSpec $body, array $queryParam
      */
     public function swarmUnlockkey(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmUnlockkey(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmUnlockkey(), $fetch);
     }
     /**
      * 
@@ -1897,7 +1897,7 @@ public function swarmUnlockkey(string $fetch = self::FETCH_OBJECT)
      */
     public function swarmUnlock(\Docker\Api\Model\SwarmUnlockPostBody $body, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SwarmUnlock($body), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SwarmUnlock($body), $fetch);
     }
     /**
     * 
@@ -1922,7 +1922,7 @@ public function swarmUnlock(\Docker\Api\Model\SwarmUnlockPostBody $body, string
     */
     public function serviceList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ServiceList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ServiceList($queryParameters), $fetch);
     }
     /**
     * 
@@ -1947,7 +1947,7 @@ public function serviceList(array $queryParameters = array(), string $fetch = se
     */
     public function serviceCreate(\Docker\Api\Model\ServicesCreatePostBody $body, array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ServiceCreate($body, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ServiceCreate($body, $headerParameters), $fetch);
     }
     /**
      * 
@@ -1962,7 +1962,7 @@ public function serviceCreate(\Docker\Api\Model\ServicesCreatePostBody $body, ar
      */
     public function serviceDelete(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ServiceDelete($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ServiceDelete($id), $fetch);
     }
     /**
      * 
@@ -1980,7 +1980,7 @@ public function serviceDelete(string $id, string $fetch = self::FETCH_OBJECT)
      */
     public function serviceInspect(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ServiceInspect($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ServiceInspect($id, $queryParameters), $fetch);
     }
     /**
     * 
@@ -2020,7 +2020,7 @@ public function serviceInspect(string $id, array $queryParameters = array(), str
     */
     public function serviceUpdate(string $id, \Docker\Api\Model\ServicesIdUpdatePostBody $body, array $queryParameters = array(), array $headerParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ServiceUpdate($id, $body, $queryParameters, $headerParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ServiceUpdate($id, $body, $queryParameters, $headerParameters), $fetch);
     }
     /**
     * Get `stdout` and `stderr` logs from a service. See also
@@ -2051,7 +2051,7 @@ public function serviceUpdate(string $id, \Docker\Api\Model\ServicesIdUpdatePost
     */
     public function serviceLogs(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ServiceLogs($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ServiceLogs($id, $queryParameters), $fetch);
     }
     /**
     * 
@@ -2078,7 +2078,7 @@ public function serviceLogs(string $id, array $queryParameters = array(), string
     */
     public function taskList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\TaskList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\TaskList($queryParameters), $fetch);
     }
     /**
      * 
@@ -2093,7 +2093,7 @@ public function taskList(array $queryParameters = array(), string $fetch = self:
      */
     public function taskInspect(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\TaskInspect($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\TaskInspect($id), $fetch);
     }
     /**
     * Get `stdout` and `stderr` logs from a task.
@@ -2124,7 +2124,7 @@ public function taskInspect(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function taskLogs(string $id, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\TaskLogs($id, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\TaskLogs($id, $queryParameters), $fetch);
     }
     /**
     * 
@@ -2149,7 +2149,7 @@ public function taskLogs(string $id, array $queryParameters = array(), string $f
     */
     public function secretList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SecretList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SecretList($queryParameters), $fetch);
     }
     /**
      * 
@@ -2164,7 +2164,7 @@ public function secretList(array $queryParameters = array(), string $fetch = sel
      */
     public function secretCreate(\Docker\Api\Model\SecretsCreatePostBody $body, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SecretCreate($body), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SecretCreate($body), $fetch);
     }
     /**
      * 
@@ -2179,7 +2179,7 @@ public function secretCreate(\Docker\Api\Model\SecretsCreatePostBody $body, stri
      */
     public function secretDelete(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SecretDelete($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SecretDelete($id), $fetch);
     }
     /**
      * 
@@ -2194,7 +2194,7 @@ public function secretDelete(string $id, string $fetch = self::FETCH_OBJECT)
      */
     public function secretInspect(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SecretInspect($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SecretInspect($id), $fetch);
     }
     /**
     * 
@@ -2219,7 +2219,7 @@ public function secretInspect(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function secretUpdate(string $id, \Docker\Api\Model\SecretSpec $body, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\SecretUpdate($id, $body, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\SecretUpdate($id, $body, $queryParameters), $fetch);
     }
     /**
     * 
@@ -2244,7 +2244,7 @@ public function secretUpdate(string $id, \Docker\Api\Model\SecretSpec $body, arr
     */
     public function configList(array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ConfigList($queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ConfigList($queryParameters), $fetch);
     }
     /**
      * 
@@ -2259,7 +2259,7 @@ public function configList(array $queryParameters = array(), string $fetch = sel
      */
     public function configCreate(\Docker\Api\Model\ConfigsCreatePostBody $body, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ConfigCreate($body), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ConfigCreate($body), $fetch);
     }
     /**
      * 
@@ -2274,7 +2274,7 @@ public function configCreate(\Docker\Api\Model\ConfigsCreatePostBody $body, stri
      */
     public function configDelete(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ConfigDelete($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ConfigDelete($id), $fetch);
     }
     /**
      * 
@@ -2289,7 +2289,7 @@ public function configDelete(string $id, string $fetch = self::FETCH_OBJECT)
      */
     public function configInspect(string $id, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ConfigInspect($id), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ConfigInspect($id), $fetch);
     }
     /**
     * 
@@ -2314,7 +2314,7 @@ public function configInspect(string $id, string $fetch = self::FETCH_OBJECT)
     */
     public function configUpdate(string $id, \Docker\Api\Model\ConfigSpec $body, array $queryParameters = array(), string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\ConfigUpdate($id, $body, $queryParameters), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\ConfigUpdate($id, $body, $queryParameters), $fetch);
     }
     /**
      * Return image digest and platform information by contacting the registry.
@@ -2328,7 +2328,7 @@ public function configUpdate(string $id, \Docker\Api\Model\ConfigSpec $body, arr
      */
     public function distributionInspect(string $name, string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\DistributionInspect($name), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\DistributionInspect($name), $fetch);
     }
     /**
      * @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
@@ -2339,9 +2339,9 @@ public function distributionInspect(string $name, string $fetch = self::FETCH_OB
      */
     public function session(string $fetch = self::FETCH_OBJECT)
     {
-        return $this->executePsr7Endpoint(new \Docker\Api\Endpoint\Session(), $fetch);
+        return $this->executeEndpoint(new \Docker\Api\Endpoint\Session(), $fetch);
     }
-    public static function create($httpClient = null, array $additionalPlugins = array())
+    public static function create($httpClient = null, array $additionalPlugins = array(), array $additionalNormalizers = array())
     {
         if (null === $httpClient) {
             $httpClient = \Http\Discovery\Psr18ClientDiscovery::find();
@@ -2353,7 +2353,11 @@ public static function create($httpClient = null, array $additionalPlugins = arr
         }
         $requestFactory = \Http\Discovery\Psr17FactoryDiscovery::findRequestFactory();
         $streamFactory = \Http\Discovery\Psr17FactoryDiscovery::findStreamFactory();
-        $serializer = new \Symfony\Component\Serializer\Serializer(array(new \Symfony\Component\Serializer\Normalizer\ArrayDenormalizer(), new \Docker\Api\Normalizer\JaneObjectNormalizer()), array(new \Symfony\Component\Serializer\Encoder\JsonEncoder(new \Symfony\Component\Serializer\Encoder\JsonEncode(), new \Symfony\Component\Serializer\Encoder\JsonDecode(array('json_decode_associative' => true)))));
+        $normalizers = array(new \Symfony\Component\Serializer\Normalizer\ArrayDenormalizer(), new \Docker\Api\Normalizer\JaneObjectNormalizer());
+        if (count($additionalNormalizers) > 0) {
+            $normalizers = array_merge($normalizers, $additionalNormalizers);
+        }
+        $serializer = new \Symfony\Component\Serializer\Serializer($normalizers, array(new \Symfony\Component\Serializer\Encoder\JsonEncoder(new \Symfony\Component\Serializer\Encoder\JsonEncode(), new \Symfony\Component\Serializer\Encoder\JsonDecode(array('json_decode_associative' => true)))));
         return new static($httpClient, $requestFactory, $serializer, $streamFactory);
     }
 }
\ No newline at end of file
diff --git a/src/Endpoint/BuildPrune.php b/src/Endpoint/BuildPrune.php
index fa86263..8788088 100644
--- a/src/Endpoint/BuildPrune.php
+++ b/src/Endpoint/BuildPrune.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class BuildPrune extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class BuildPrune extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -30,7 +30,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -65,7 +65,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\BuildPrunePostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\BuildPrunePostResponse200', 'json');
diff --git a/src/Endpoint/ConfigCreate.php b/src/Endpoint/ConfigCreate.php
index b7ef26b..627567d 100644
--- a/src/Endpoint/ConfigCreate.php
+++ b/src/Endpoint/ConfigCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ConfigCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ConfigCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\ConfigsCreatePostBody $body)
     {
         $this->body = $body;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\IdResponse
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\IdResponse', 'json');
diff --git a/src/Endpoint/ConfigDelete.php b/src/Endpoint/ConfigDelete.php
index bd20b4b..927e37a 100644
--- a/src/Endpoint/ConfigDelete.php
+++ b/src/Endpoint/ConfigDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ConfigDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ConfigDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ConfigInspect.php b/src/Endpoint/ConfigInspect.php
index c693cda..3bc9645 100644
--- a/src/Endpoint/ConfigInspect.php
+++ b/src/Endpoint/ConfigInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ConfigInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ConfigInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Config
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Config', 'json');
diff --git a/src/Endpoint/ConfigList.php b/src/Endpoint/ConfigList.php
index 5a579e8..b701e35 100644
--- a/src/Endpoint/ConfigList.php
+++ b/src/Endpoint/ConfigList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ConfigList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ConfigList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -24,7 +24,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Config[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Config[]', 'json');
diff --git a/src/Endpoint/ConfigUpdate.php b/src/Endpoint/ConfigUpdate.php
index 888661c..630dc08 100644
--- a/src/Endpoint/ConfigUpdate.php
+++ b/src/Endpoint/ConfigUpdate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ConfigUpdate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ConfigUpdate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -25,7 +25,7 @@ public function __construct(string $id, \Docker\Api\Model\ConfigSpec $body, arra
         $this->body = $body;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -61,7 +61,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerArchive.php b/src/Endpoint/ContainerArchive.php
index d61611c..1f158ca 100644
--- a/src/Endpoint/ContainerArchive.php
+++ b/src/Endpoint/ContainerArchive.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerArchive extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerArchive extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerArchiveInfo.php b/src/Endpoint/ContainerArchiveInfo.php
index 70347c9..1711104 100644
--- a/src/Endpoint/ContainerArchiveInfo.php
+++ b/src/Endpoint/ContainerArchiveInfo.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerArchiveInfo extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerArchiveInfo extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -21,7 +21,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'HEAD';
@@ -56,7 +56,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerAttach.php b/src/Endpoint/ContainerAttach.php
index 1c98af7..d0054f4 100644
--- a/src/Endpoint/ContainerAttach.php
+++ b/src/Endpoint/ContainerAttach.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerAttach extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerAttach extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -128,7 +128,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -168,7 +168,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (101 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerAttachWebsocket.php b/src/Endpoint/ContainerAttachWebsocket.php
index 5c1e7ad..de3897f 100644
--- a/src/Endpoint/ContainerAttachWebsocket.php
+++ b/src/Endpoint/ContainerAttachWebsocket.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerAttachWebsocket extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerAttachWebsocket extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -26,7 +26,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -66,7 +66,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (101 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerChanges.php b/src/Endpoint/ContainerChanges.php
index 9c4df9c..93e377c 100644
--- a/src/Endpoint/ContainerChanges.php
+++ b/src/Endpoint/ContainerChanges.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerChanges extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerChanges extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -45,7 +45,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\ContainersIdChangesGetResponse200Item[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersIdChangesGetResponse200Item[]', 'json');
diff --git a/src/Endpoint/ContainerCreate.php b/src/Endpoint/ContainerCreate.php
index 9616fcd..a07a689 100644
--- a/src/Endpoint/ContainerCreate.php
+++ b/src/Endpoint/ContainerCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -19,7 +19,7 @@ public function __construct(\Docker\Api\Model\ContainersCreatePostBody $body, ar
         $this->body = $body;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -55,7 +55,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ContainersCreatePostResponse201
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersCreatePostResponse201', 'json');
diff --git a/src/Endpoint/ContainerDelete.php b/src/Endpoint/ContainerDelete.php
index 27a9ee6..2bd2e52 100644
--- a/src/Endpoint/ContainerDelete.php
+++ b/src/Endpoint/ContainerDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerExec.php b/src/Endpoint/ContainerExec.php
index 57edc32..e4822c0 100644
--- a/src/Endpoint/ContainerExec.php
+++ b/src/Endpoint/ContainerExec.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerExec extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerExec extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -16,7 +16,7 @@ public function __construct(string $id, \Docker\Api\Model\ContainersIdExecPostBo
         $this->id = $id;
         $this->body = $execConfig;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -42,7 +42,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\IdResponse
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\IdResponse', 'json');
diff --git a/src/Endpoint/ContainerExport.php b/src/Endpoint/ContainerExport.php
index 9b97e6f..83d3095 100644
--- a/src/Endpoint/ContainerExport.php
+++ b/src/Endpoint/ContainerExport.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerExport extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerExport extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerInspect.php b/src/Endpoint/ContainerInspect.php
index 6ba7744..848ac7b 100644
--- a/src/Endpoint/ContainerInspect.php
+++ b/src/Endpoint/ContainerInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -52,7 +52,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ContainersIdJsonGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersIdJsonGetResponse200', 'json');
diff --git a/src/Endpoint/ContainerKill.php b/src/Endpoint/ContainerKill.php
index ea1acee..2f5e76b 100644
--- a/src/Endpoint/ContainerKill.php
+++ b/src/Endpoint/ContainerKill.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerKill extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerKill extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -55,7 +55,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerList.php b/src/Endpoint/ContainerList.php
index 097731f..c7beedb 100644
--- a/src/Endpoint/ContainerList.php
+++ b/src/Endpoint/ContainerList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Returns a list of containers. For details on the format, see the
@@ -49,7 +49,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -86,7 +86,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ContainerSummaryItem[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainerSummaryItem[]', 'json');
diff --git a/src/Endpoint/ContainerLogs.php b/src/Endpoint/ContainerLogs.php
index 551af90..35b2aa4 100644
--- a/src/Endpoint/ContainerLogs.php
+++ b/src/Endpoint/ContainerLogs.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerLogs extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerLogs extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -30,7 +30,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -70,7 +70,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/ContainerPause.php b/src/Endpoint/ContainerPause.php
index 3b9ce4f..165f608 100644
--- a/src/Endpoint/ContainerPause.php
+++ b/src/Endpoint/ContainerPause.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerPause extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerPause extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -45,7 +45,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerPrune.php b/src/Endpoint/ContainerPrune.php
index 6609e34..f149658 100644
--- a/src/Endpoint/ContainerPrune.php
+++ b/src/Endpoint/ContainerPrune.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerPrune extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerPrune extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -20,7 +20,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ContainersPrunePostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersPrunePostResponse200', 'json');
diff --git a/src/Endpoint/ContainerRename.php b/src/Endpoint/ContainerRename.php
index 104a046..1d2eb19 100644
--- a/src/Endpoint/ContainerRename.php
+++ b/src/Endpoint/ContainerRename.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerRename extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerRename extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerResize.php b/src/Endpoint/ContainerResize.php
index c9d7be2..4eddb94 100644
--- a/src/Endpoint/ContainerResize.php
+++ b/src/Endpoint/ContainerResize.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerResize extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerResize extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -19,7 +19,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -54,7 +54,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerRestart.php b/src/Endpoint/ContainerRestart.php
index d121b3c..af1cbea 100644
--- a/src/Endpoint/ContainerRestart.php
+++ b/src/Endpoint/ContainerRestart.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerRestart extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerRestart extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -52,7 +52,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerStart.php b/src/Endpoint/ContainerStart.php
index cf55315..199f8b4 100644
--- a/src/Endpoint/ContainerStart.php
+++ b/src/Endpoint/ContainerStart.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerStart extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerStart extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -21,7 +21,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -55,7 +55,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerStats.php b/src/Endpoint/ContainerStats.php
index bcd8187..9dd2197 100644
--- a/src/Endpoint/ContainerStats.php
+++ b/src/Endpoint/ContainerStats.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerStats extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerStats extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -40,7 +40,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -74,7 +74,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/ContainerStop.php b/src/Endpoint/ContainerStop.php
index dede4ce..abcd136 100644
--- a/src/Endpoint/ContainerStop.php
+++ b/src/Endpoint/ContainerStop.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerStop extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerStop extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -52,7 +52,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerTop.php b/src/Endpoint/ContainerTop.php
index 9bf2d5b..db19b31 100644
--- a/src/Endpoint/ContainerTop.php
+++ b/src/Endpoint/ContainerTop.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerTop extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerTop extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -54,7 +54,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ContainersIdTopGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersIdTopGetResponse200', 'json');
diff --git a/src/Endpoint/ContainerUnpause.php b/src/Endpoint/ContainerUnpause.php
index 16251ab..fa4c923 100644
--- a/src/Endpoint/ContainerUnpause.php
+++ b/src/Endpoint/ContainerUnpause.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerUnpause extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerUnpause extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/ContainerUpdate.php b/src/Endpoint/ContainerUpdate.php
index eb21262..b5e8552 100644
--- a/src/Endpoint/ContainerUpdate.php
+++ b/src/Endpoint/ContainerUpdate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerUpdate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerUpdate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, \Docker\Api\Model\ContainersIdUpdatePost
         $this->id = $id;
         $this->body = $update;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -43,7 +43,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\ContainersIdUpdatePostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersIdUpdatePostResponse200', 'json');
diff --git a/src/Endpoint/ContainerWait.php b/src/Endpoint/ContainerWait.php
index ec0cf40..f5589d4 100644
--- a/src/Endpoint/ContainerWait.php
+++ b/src/Endpoint/ContainerWait.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ContainerWait extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ContainerWait extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -54,7 +54,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ContainersIdWaitPostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200', 'json');
diff --git a/src/Endpoint/DistributionInspect.php b/src/Endpoint/DistributionInspect.php
index 910ba24..bcfbc91 100644
--- a/src/Endpoint/DistributionInspect.php
+++ b/src/Endpoint/DistributionInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class DistributionInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class DistributionInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\DistributionNameJsonGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200', 'json');
diff --git a/src/Endpoint/ExecInspect.php b/src/Endpoint/ExecInspect.php
index 4e01141..9828e71 100644
--- a/src/Endpoint/ExecInspect.php
+++ b/src/Endpoint/ExecInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ExecInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ExecInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\ExecIdJsonGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ExecIdJsonGetResponse200', 'json');
diff --git a/src/Endpoint/ExecResize.php b/src/Endpoint/ExecResize.php
index b13abb0..daa4651 100644
--- a/src/Endpoint/ExecResize.php
+++ b/src/Endpoint/ExecResize.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ExecResize extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ExecResize extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -21,7 +21,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -55,7 +55,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return null;
diff --git a/src/Endpoint/ExecStart.php b/src/Endpoint/ExecStart.php
index a7ba968..0b47e6e 100644
--- a/src/Endpoint/ExecStart.php
+++ b/src/Endpoint/ExecStart.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ExecStart extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ExecStart extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -19,7 +19,7 @@ public function __construct(string $id, \Docker\Api\Model\ExecIdStartPostBody $e
         $this->id = $id;
         $this->body = $execStartConfig;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -44,7 +44,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/GetPluginPrivileges.php b/src/Endpoint/GetPluginPrivileges.php
index 5d850b7..c0a83af 100644
--- a/src/Endpoint/GetPluginPrivileges.php
+++ b/src/Endpoint/GetPluginPrivileges.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class GetPluginPrivileges extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class GetPluginPrivileges extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -17,7 +17,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -50,7 +50,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\PluginsPrivilegesGetResponse200Item[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\PluginsPrivilegesGetResponse200Item[]', 'json');
diff --git a/src/Endpoint/ImageBuild.php b/src/Endpoint/ImageBuild.php
index e598065..3556fa1 100644
--- a/src/Endpoint/ImageBuild.php
+++ b/src/Endpoint/ImageBuild.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageBuild extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageBuild extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Build an image from a tar archive with a `Dockerfile` in it.
@@ -79,7 +79,7 @@ public function __construct($inputStream, array $queryParameters = array(), arra
         $this->queryParameters = $queryParameters;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -146,7 +146,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ImageCommit.php b/src/Endpoint/ImageCommit.php
index 8dd922f..93154c0 100644
--- a/src/Endpoint/ImageCommit.php
+++ b/src/Endpoint/ImageCommit.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageCommit extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageCommit extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -23,7 +23,7 @@ public function __construct(\Docker\Api\Model\ContainerConfig $containerConfig,
         $this->body = $containerConfig;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -63,7 +63,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\IdResponse
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\IdResponse', 'json');
diff --git a/src/Endpoint/ImageCreate.php b/src/Endpoint/ImageCreate.php
index 80a2110..30829d4 100644
--- a/src/Endpoint/ImageCreate.php
+++ b/src/Endpoint/ImageCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Create an image by either pulling it from a registry or importing it.
@@ -30,7 +30,7 @@ public function __construct(string $inputImage, array $queryParameters = array()
         $this->queryParameters = $queryParameters;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -78,7 +78,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ImageDelete.php b/src/Endpoint/ImageDelete.php
index 9c5e4dd..b14b2f4 100644
--- a/src/Endpoint/ImageDelete.php
+++ b/src/Endpoint/ImageDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -24,7 +24,7 @@ public function __construct(string $name, array $queryParameters = array())
         $this->name = $name;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -60,7 +60,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ImageDeleteResponseItem[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ImageDeleteResponseItem[]', 'json');
diff --git a/src/Endpoint/ImageGet.php b/src/Endpoint/ImageGet.php
index 7e7a05a..2d8273c 100644
--- a/src/Endpoint/ImageGet.php
+++ b/src/Endpoint/ImageGet.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageGet extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageGet extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -37,7 +37,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -61,7 +61,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/ImageGetAll.php b/src/Endpoint/ImageGetAll.php
index b4ac01e..ed32d1d 100644
--- a/src/Endpoint/ImageGetAll.php
+++ b/src/Endpoint/ImageGetAll.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageGetAll extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageGetAll extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Get a tarball containing all images and metadata for several image
@@ -25,7 +25,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/ImageHistory.php b/src/Endpoint/ImageHistory.php
index 2f771b7..1ebce3f 100644
--- a/src/Endpoint/ImageHistory.php
+++ b/src/Endpoint/ImageHistory.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageHistory extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageHistory extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\ImagesNameHistoryGetResponse200Item[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ImagesNameHistoryGetResponse200Item[]', 'json');
diff --git a/src/Endpoint/ImageInspect.php b/src/Endpoint/ImageInspect.php
index 8ad311e..9ee947b 100644
--- a/src/Endpoint/ImageInspect.php
+++ b/src/Endpoint/ImageInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Image
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Image', 'json');
diff --git a/src/Endpoint/ImageList.php b/src/Endpoint/ImageList.php
index ea4b99d..10ad70b 100644
--- a/src/Endpoint/ImageList.php
+++ b/src/Endpoint/ImageList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Returns a list of images on the server. Note that it uses a different, smaller representation of an image than inspecting a single image.
@@ -27,7 +27,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -62,7 +62,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ImageSummary[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ImageSummary[]', 'json');
diff --git a/src/Endpoint/ImageLoad.php b/src/Endpoint/ImageLoad.php
index 4967ee5..32c5a37 100644
--- a/src/Endpoint/ImageLoad.php
+++ b/src/Endpoint/ImageLoad.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageLoad extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageLoad extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Load a set of images and tags into a repository.
@@ -20,7 +20,7 @@ public function __construct($imagesTarball, array $queryParameters = array())
         $this->body = $imagesTarball;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ImagePrune.php b/src/Endpoint/ImagePrune.php
index 94b42e3..f5572ef 100644
--- a/src/Endpoint/ImagePrune.php
+++ b/src/Endpoint/ImagePrune.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImagePrune extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImagePrune extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -22,7 +22,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -55,7 +55,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ImagesPrunePostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ImagesPrunePostResponse200', 'json');
diff --git a/src/Endpoint/ImagePush.php b/src/Endpoint/ImagePush.php
index 9cb2341..a98f26b 100644
--- a/src/Endpoint/ImagePush.php
+++ b/src/Endpoint/ImagePush.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImagePush extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImagePush extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -33,7 +33,7 @@ public function __construct(string $name, array $queryParameters = array(), arra
         $this->queryParameters = $queryParameters;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -76,7 +76,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ImageSearch.php b/src/Endpoint/ImageSearch.php
index 91dc307..61ee788 100644
--- a/src/Endpoint/ImageSearch.php
+++ b/src/Endpoint/ImageSearch.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageSearch extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageSearch extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Search for an image on Docker Hub.
@@ -22,7 +22,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -57,7 +57,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\ImagesSearchGetResponse200Item[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ImagesSearchGetResponse200Item[]', 'json');
diff --git a/src/Endpoint/ImageTag.php b/src/Endpoint/ImageTag.php
index 50db10e..c4d7a0b 100644
--- a/src/Endpoint/ImageTag.php
+++ b/src/Endpoint/ImageTag.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ImageTag extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ImageTag extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -19,7 +19,7 @@ public function __construct(string $name, array $queryParameters = array())
         $this->name = $name;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -56,7 +56,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return null;
diff --git a/src/Endpoint/NetworkConnect.php b/src/Endpoint/NetworkConnect.php
index 16011b8..106ff5d 100644
--- a/src/Endpoint/NetworkConnect.php
+++ b/src/Endpoint/NetworkConnect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkConnect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkConnect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -16,7 +16,7 @@ public function __construct(string $id, \Docker\Api\Model\NetworksIdConnectPostB
         $this->id = $id;
         $this->body = $container;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -42,7 +42,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/NetworkCreate.php b/src/Endpoint/NetworkCreate.php
index c0ddd23..ad87b04 100644
--- a/src/Endpoint/NetworkCreate.php
+++ b/src/Endpoint/NetworkCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\NetworksCreatePostBody $networkCon
     {
         $this->body = $networkConfig;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\NetworksCreatePostResponse201
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\NetworksCreatePostResponse201', 'json');
diff --git a/src/Endpoint/NetworkDelete.php b/src/Endpoint/NetworkDelete.php
index 21f1974..1209a20 100644
--- a/src/Endpoint/NetworkDelete.php
+++ b/src/Endpoint/NetworkDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/NetworkDisconnect.php b/src/Endpoint/NetworkDisconnect.php
index c5c4789..8bb3e70 100644
--- a/src/Endpoint/NetworkDisconnect.php
+++ b/src/Endpoint/NetworkDisconnect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkDisconnect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkDisconnect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -16,7 +16,7 @@ public function __construct(string $id, \Docker\Api\Model\NetworksIdDisconnectPo
         $this->id = $id;
         $this->body = $container;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -42,7 +42,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/NetworkInspect.php b/src/Endpoint/NetworkInspect.php
index 7cbb264..c6c3e93 100644
--- a/src/Endpoint/NetworkInspect.php
+++ b/src/Endpoint/NetworkInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -19,7 +19,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -54,7 +54,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Network
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Network', 'json');
diff --git a/src/Endpoint/NetworkList.php b/src/Endpoint/NetworkList.php
index e900aed..70004a0 100644
--- a/src/Endpoint/NetworkList.php
+++ b/src/Endpoint/NetworkList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Returns a list of networks. For details on the format, see the
@@ -36,7 +36,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -69,7 +69,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Network[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Network[]', 'json');
diff --git a/src/Endpoint/NetworkPrune.php b/src/Endpoint/NetworkPrune.php
index d3baf4a..29db374 100644
--- a/src/Endpoint/NetworkPrune.php
+++ b/src/Endpoint/NetworkPrune.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NetworkPrune extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NetworkPrune extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -20,7 +20,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\NetworksPrunePostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\NetworksPrunePostResponse200', 'json');
diff --git a/src/Endpoint/NodeDelete.php b/src/Endpoint/NodeDelete.php
index ca413af..0ea8f00 100644
--- a/src/Endpoint/NodeDelete.php
+++ b/src/Endpoint/NodeDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NodeDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NodeDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/NodeInspect.php b/src/Endpoint/NodeInspect.php
index e829ca3..29d2cf5 100644
--- a/src/Endpoint/NodeInspect.php
+++ b/src/Endpoint/NodeInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NodeInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NodeInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Node
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Node', 'json');
diff --git a/src/Endpoint/NodeList.php b/src/Endpoint/NodeList.php
index 9c66f2b..f95db6a 100644
--- a/src/Endpoint/NodeList.php
+++ b/src/Endpoint/NodeList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NodeList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NodeList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -24,7 +24,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Node[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Node[]', 'json');
diff --git a/src/Endpoint/NodeUpdate.php b/src/Endpoint/NodeUpdate.php
index 9e3c686..e920d17 100644
--- a/src/Endpoint/NodeUpdate.php
+++ b/src/Endpoint/NodeUpdate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class NodeUpdate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class NodeUpdate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -22,7 +22,7 @@ public function __construct(string $id, \Docker\Api\Model\NodeSpec $body, array
         $this->body = $body;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/PluginCreate.php b/src/Endpoint/PluginCreate.php
index 5ea1dfb..4e61df2 100644
--- a/src/Endpoint/PluginCreate.php
+++ b/src/Endpoint/PluginCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -19,7 +19,7 @@ public function __construct($tarContext, array $queryParameters = array())
         $this->body = $tarContext;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -52,7 +52,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/PluginDelete.php b/src/Endpoint/PluginDelete.php
index 1324fd2..a78152d 100644
--- a/src/Endpoint/PluginDelete.php
+++ b/src/Endpoint/PluginDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -22,7 +22,7 @@ public function __construct(string $name, array $queryParameters = array())
         $this->name = $name;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -56,7 +56,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Plugin
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Plugin', 'json');
diff --git a/src/Endpoint/PluginDisable.php b/src/Endpoint/PluginDisable.php
index 736ab76..7aaf719 100644
--- a/src/Endpoint/PluginDisable.php
+++ b/src/Endpoint/PluginDisable.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginDisable extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginDisable extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -15,7 +15,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/PluginEnable.php b/src/Endpoint/PluginEnable.php
index 3cfbfe9..8fa9d76 100644
--- a/src/Endpoint/PluginEnable.php
+++ b/src/Endpoint/PluginEnable.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginEnable extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginEnable extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -20,7 +20,7 @@ public function __construct(string $name, array $queryParameters = array())
         $this->name = $name;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -54,7 +54,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/PluginInspect.php b/src/Endpoint/PluginInspect.php
index 5d809e5..c9ba899 100644
--- a/src/Endpoint/PluginInspect.php
+++ b/src/Endpoint/PluginInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -15,7 +15,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Plugin
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Plugin', 'json');
diff --git a/src/Endpoint/PluginList.php b/src/Endpoint/PluginList.php
index ff1a35e..2113eea 100644
--- a/src/Endpoint/PluginList.php
+++ b/src/Endpoint/PluginList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Returns information about installed plugins.
@@ -22,7 +22,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -55,7 +55,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Plugin[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Plugin[]', 'json');
diff --git a/src/Endpoint/PluginPull.php b/src/Endpoint/PluginPull.php
index 7515bf8..e03b401 100644
--- a/src/Endpoint/PluginPull.php
+++ b/src/Endpoint/PluginPull.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginPull extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginPull extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Pulls and installs a plugin. After the plugin is installed, it can be
@@ -35,7 +35,7 @@ public function __construct(array $body, array $queryParameters = array(), array
         $this->queryParameters = $queryParameters;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -78,7 +78,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/PluginPush.php b/src/Endpoint/PluginPush.php
index 0a5d2cb..6bcf74f 100644
--- a/src/Endpoint/PluginPush.php
+++ b/src/Endpoint/PluginPush.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginPush extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginPush extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -15,7 +15,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/PluginSet.php b/src/Endpoint/PluginSet.php
index 62ca7c9..1df4167 100644
--- a/src/Endpoint/PluginSet.php
+++ b/src/Endpoint/PluginSet.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginSet extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginSet extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $name, array $body)
         $this->name = $name;
         $this->body = $body;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -43,7 +43,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/PluginUpgrade.php b/src/Endpoint/PluginUpgrade.php
index 4c6a741..7e63010 100644
--- a/src/Endpoint/PluginUpgrade.php
+++ b/src/Endpoint/PluginUpgrade.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PluginUpgrade extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PluginUpgrade extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -34,7 +34,7 @@ public function __construct(string $name, array $body, array $queryParameters =
         $this->queryParameters = $queryParameters;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -77,7 +77,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/PutContainerArchive.php b/src/Endpoint/PutContainerArchive.php
index 8969f7b..539d02b 100644
--- a/src/Endpoint/PutContainerArchive.php
+++ b/src/Endpoint/PutContainerArchive.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class PutContainerArchive extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class PutContainerArchive extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -30,7 +30,7 @@ public function __construct(string $id, $inputStream, array $queryParameters = a
         $this->body = $inputStream;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'PUT';
@@ -68,7 +68,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/SecretCreate.php b/src/Endpoint/SecretCreate.php
index 66f89f8..e99e679 100644
--- a/src/Endpoint/SecretCreate.php
+++ b/src/Endpoint/SecretCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SecretCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SecretCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\SecretsCreatePostBody $body)
     {
         $this->body = $body;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\IdResponse
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\IdResponse', 'json');
diff --git a/src/Endpoint/SecretDelete.php b/src/Endpoint/SecretDelete.php
index 184f296..ea0ba2e 100644
--- a/src/Endpoint/SecretDelete.php
+++ b/src/Endpoint/SecretDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SecretDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SecretDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/SecretInspect.php b/src/Endpoint/SecretInspect.php
index aafb4a6..c1daf60 100644
--- a/src/Endpoint/SecretInspect.php
+++ b/src/Endpoint/SecretInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SecretInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SecretInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Secret
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Secret', 'json');
diff --git a/src/Endpoint/SecretList.php b/src/Endpoint/SecretList.php
index 8cff28f..b9d4c4e 100644
--- a/src/Endpoint/SecretList.php
+++ b/src/Endpoint/SecretList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SecretList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SecretList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -24,7 +24,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Secret[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Secret[]', 'json');
diff --git a/src/Endpoint/SecretUpdate.php b/src/Endpoint/SecretUpdate.php
index 98499d3..2ffc8f7 100644
--- a/src/Endpoint/SecretUpdate.php
+++ b/src/Endpoint/SecretUpdate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SecretUpdate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SecretUpdate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -25,7 +25,7 @@ public function __construct(string $id, \Docker\Api\Model\SecretSpec $body, arra
         $this->body = $body;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -61,7 +61,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ServiceCreate.php b/src/Endpoint/ServiceCreate.php
index 3fa0a29..b60b23d 100644
--- a/src/Endpoint/ServiceCreate.php
+++ b/src/Endpoint/ServiceCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ServiceCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ServiceCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -22,7 +22,7 @@ public function __construct(\Docker\Api\Model\ServicesCreatePostBody $body, arra
         $this->body = $body;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -59,7 +59,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null|\Docker\Api\Model\ServicesCreatePostResponse201
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ServicesCreatePostResponse201', 'json');
diff --git a/src/Endpoint/ServiceDelete.php b/src/Endpoint/ServiceDelete.php
index b008438..c705abb 100644
--- a/src/Endpoint/ServiceDelete.php
+++ b/src/Endpoint/ServiceDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ServiceDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ServiceDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/ServiceInspect.php b/src/Endpoint/ServiceInspect.php
index 33c4d30..9fec129 100644
--- a/src/Endpoint/ServiceInspect.php
+++ b/src/Endpoint/ServiceInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ServiceInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ServiceInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Service
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Service', 'json');
diff --git a/src/Endpoint/ServiceList.php b/src/Endpoint/ServiceList.php
index a738228..a6c9847 100644
--- a/src/Endpoint/ServiceList.php
+++ b/src/Endpoint/ServiceList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ServiceList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ServiceList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -24,7 +24,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -58,7 +58,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Service[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Service[]', 'json');
diff --git a/src/Endpoint/ServiceLogs.php b/src/Endpoint/ServiceLogs.php
index 8da9297..29d4211 100644
--- a/src/Endpoint/ServiceLogs.php
+++ b/src/Endpoint/ServiceLogs.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ServiceLogs extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ServiceLogs extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -31,7 +31,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -72,7 +72,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/ServiceUpdate.php b/src/Endpoint/ServiceUpdate.php
index 2ff5c30..fbc8d6b 100644
--- a/src/Endpoint/ServiceUpdate.php
+++ b/src/Endpoint/ServiceUpdate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class ServiceUpdate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class ServiceUpdate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -41,7 +41,7 @@ public function __construct(string $id, \Docker\Api\Model\ServicesIdUpdatePostBo
         $this->queryParameters = $queryParameters;
         $this->headerParameters = $headerParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -88,7 +88,7 @@ protected function getHeadersOptionsResolver() : \Symfony\Component\OptionsResol
      *
      * @return null|\Docker\Api\Model\ServiceUpdateResponse
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\ServiceUpdateResponse', 'json');
diff --git a/src/Endpoint/Session.php b/src/Endpoint/Session.php
index a410baf..e454e8b 100644
--- a/src/Endpoint/Session.php
+++ b/src/Endpoint/Session.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class Session extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class Session extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -29,7 +29,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (101 === $status) {
             return null;
diff --git a/src/Endpoint/SwarmInit.php b/src/Endpoint/SwarmInit.php
index ca2f22f..fb959cd 100644
--- a/src/Endpoint/SwarmInit.php
+++ b/src/Endpoint/SwarmInit.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmInit extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmInit extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\SwarmInitPostBody $body)
     {
         $this->body = $body;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/SwarmInspect.php b/src/Endpoint/SwarmInspect.php
index e16af05..704224e 100644
--- a/src/Endpoint/SwarmInspect.php
+++ b/src/Endpoint/SwarmInspect.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -30,7 +30,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Swarm
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Swarm', 'json');
diff --git a/src/Endpoint/SwarmJoin.php b/src/Endpoint/SwarmJoin.php
index ef30941..0fb9cd5 100644
--- a/src/Endpoint/SwarmJoin.php
+++ b/src/Endpoint/SwarmJoin.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmJoin extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmJoin extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\SwarmJoinPostBody $body)
     {
         $this->body = $body;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/SwarmLeave.php b/src/Endpoint/SwarmLeave.php
index ecae351..7604dc3 100644
--- a/src/Endpoint/SwarmLeave.php
+++ b/src/Endpoint/SwarmLeave.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmLeave extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmLeave extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -17,7 +17,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -51,7 +51,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/SwarmUnlock.php b/src/Endpoint/SwarmUnlock.php
index 5c34a17..b00de9e 100644
--- a/src/Endpoint/SwarmUnlock.php
+++ b/src/Endpoint/SwarmUnlock.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmUnlock extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmUnlock extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\SwarmUnlockPostBody $body)
     {
         $this->body = $body;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -38,7 +38,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/SwarmUnlockkey.php b/src/Endpoint/SwarmUnlockkey.php
index 15a02aa..6e49674 100644
--- a/src/Endpoint/SwarmUnlockkey.php
+++ b/src/Endpoint/SwarmUnlockkey.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmUnlockkey extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmUnlockkey extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -29,7 +29,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\SwarmUnlockkeyGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\SwarmUnlockkeyGetResponse200', 'json');
diff --git a/src/Endpoint/SwarmUpdate.php b/src/Endpoint/SwarmUpdate.php
index e549534..15855e7 100644
--- a/src/Endpoint/SwarmUpdate.php
+++ b/src/Endpoint/SwarmUpdate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SwarmUpdate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SwarmUpdate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -22,7 +22,7 @@ public function __construct(\Docker\Api\Model\SwarmSpec $body, array $queryParam
         $this->body = $body;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -60,7 +60,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return null;
diff --git a/src/Endpoint/SystemAuth.php b/src/Endpoint/SystemAuth.php
index b1f672b..5c66abb 100644
--- a/src/Endpoint/SystemAuth.php
+++ b/src/Endpoint/SystemAuth.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemAuth extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemAuth extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Validate credentials for a registry and, if available, get an identity
@@ -15,7 +15,7 @@ public function __construct(\Docker\Api\Model\AuthConfig $authConfig)
     {
         $this->body = $authConfig;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\AuthPostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\AuthPostResponse200', 'json');
diff --git a/src/Endpoint/SystemDataUsage.php b/src/Endpoint/SystemDataUsage.php
index 4979c50..7bacd48 100644
--- a/src/Endpoint/SystemDataUsage.php
+++ b/src/Endpoint/SystemDataUsage.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemDataUsage extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemDataUsage extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -28,7 +28,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\SystemDfGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\SystemDfGetResponse200', 'json');
diff --git a/src/Endpoint/SystemEvents.php b/src/Endpoint/SystemEvents.php
index e39b9e1..e99319b 100644
--- a/src/Endpoint/SystemEvents.php
+++ b/src/Endpoint/SystemEvents.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemEvents extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemEvents extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * Stream real-time events from the server.
@@ -54,7 +54,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -90,7 +90,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\EventsGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\EventsGetResponse200', 'json');
diff --git a/src/Endpoint/SystemInfo.php b/src/Endpoint/SystemInfo.php
index 760ba8e..1e9f191 100644
--- a/src/Endpoint/SystemInfo.php
+++ b/src/Endpoint/SystemInfo.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemInfo extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemInfo extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -28,7 +28,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\SystemInfo
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\SystemInfo', 'json');
diff --git a/src/Endpoint/SystemPing.php b/src/Endpoint/SystemPing.php
index 5d38cf2..d85be8e 100644
--- a/src/Endpoint/SystemPing.php
+++ b/src/Endpoint/SystemPing.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemPing extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemPing extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -28,7 +28,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/SystemPingHead.php b/src/Endpoint/SystemPingHead.php
index 367a633..4bd8f14 100644
--- a/src/Endpoint/SystemPingHead.php
+++ b/src/Endpoint/SystemPingHead.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemPingHead extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemPingHead extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'HEAD';
@@ -28,7 +28,7 @@ public function getExtraHeaders() : array
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/SystemVersion.php b/src/Endpoint/SystemVersion.php
index f7aba61..f9528ea 100644
--- a/src/Endpoint/SystemVersion.php
+++ b/src/Endpoint/SystemVersion.php
@@ -2,9 +2,9 @@
 
 namespace Docker\Api\Endpoint;
 
-class SystemVersion extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class SystemVersion extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -28,7 +28,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\SystemVersion
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\SystemVersion', 'json');
diff --git a/src/Endpoint/TaskInspect.php b/src/Endpoint/TaskInspect.php
index cc63642..b4579ef 100644
--- a/src/Endpoint/TaskInspect.php
+++ b/src/Endpoint/TaskInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class TaskInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class TaskInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -40,7 +40,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Task
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Task', 'json');
diff --git a/src/Endpoint/TaskList.php b/src/Endpoint/TaskList.php
index 156f569..10253db 100644
--- a/src/Endpoint/TaskList.php
+++ b/src/Endpoint/TaskList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class TaskList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class TaskList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -26,7 +26,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -60,7 +60,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\Task[]
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Task[]', 'json');
diff --git a/src/Endpoint/TaskLogs.php b/src/Endpoint/TaskLogs.php
index feb3ac0..6a5169a 100644
--- a/src/Endpoint/TaskLogs.php
+++ b/src/Endpoint/TaskLogs.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class TaskLogs extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class TaskLogs extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $id;
     /**
@@ -31,7 +31,7 @@ public function __construct(string $id, array $queryParameters = array())
         $this->id = $id;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -72,7 +72,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return json_decode($body);
diff --git a/src/Endpoint/VolumeCreate.php b/src/Endpoint/VolumeCreate.php
index 4c79b5e..774c662 100644
--- a/src/Endpoint/VolumeCreate.php
+++ b/src/Endpoint/VolumeCreate.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class VolumeCreate extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class VolumeCreate extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
      * 
@@ -13,7 +13,7 @@ public function __construct(\Docker\Api\Model\VolumesCreatePostBody $volumeConfi
     {
         $this->body = $volumeConfig;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -37,7 +37,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Volume
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (201 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Volume', 'json');
diff --git a/src/Endpoint/VolumeDelete.php b/src/Endpoint/VolumeDelete.php
index 417960e..1ff8f32 100644
--- a/src/Endpoint/VolumeDelete.php
+++ b/src/Endpoint/VolumeDelete.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class VolumeDelete extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class VolumeDelete extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -18,7 +18,7 @@ public function __construct(string $name, array $queryParameters = array())
         $this->name = $name;
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'DELETE';
@@ -53,7 +53,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (204 === $status) {
             return null;
diff --git a/src/Endpoint/VolumeInspect.php b/src/Endpoint/VolumeInspect.php
index 7e4d32c..38b2233 100644
--- a/src/Endpoint/VolumeInspect.php
+++ b/src/Endpoint/VolumeInspect.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class VolumeInspect extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class VolumeInspect extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     protected $name;
     /**
@@ -14,7 +14,7 @@ public function __construct(string $name)
     {
         $this->name = $name;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -39,7 +39,7 @@ public function getExtraHeaders() : array
      *
      * @return null|\Docker\Api\Model\Volume
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\Volume', 'json');
diff --git a/src/Endpoint/VolumeList.php b/src/Endpoint/VolumeList.php
index 977b28c..17fd642 100644
--- a/src/Endpoint/VolumeList.php
+++ b/src/Endpoint/VolumeList.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class VolumeList extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class VolumeList extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -26,7 +26,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'GET';
@@ -59,7 +59,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\VolumesGetResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\VolumesGetResponse200', 'json');
diff --git a/src/Endpoint/VolumePrune.php b/src/Endpoint/VolumePrune.php
index 6c50a56..4842025 100644
--- a/src/Endpoint/VolumePrune.php
+++ b/src/Endpoint/VolumePrune.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Endpoint;
 
-class VolumePrune extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Jane\OpenApiRuntime\Client\Psr7Endpoint
+class VolumePrune extends \Docker\Api\Runtime\Client\BaseEndpoint implements \Docker\Api\Runtime\Client\Endpoint
 {
     /**
     * 
@@ -19,7 +19,7 @@ public function __construct(array $queryParameters = array())
     {
         $this->queryParameters = $queryParameters;
     }
-    use \Jane\OpenApiRuntime\Client\Psr7EndpointTrait;
+    use \Docker\Api\Runtime\Client\EndpointTrait;
     public function getMethod() : string
     {
         return 'POST';
@@ -52,7 +52,7 @@ protected function getQueryOptionsResolver() : \Symfony\Component\OptionsResolve
      *
      * @return null|\Docker\Api\Model\VolumesPrunePostResponse200
      */
-    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType)
+    protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer, ?string $contentType = null)
     {
         if (200 === $status) {
             return $serializer->deserialize($body, 'Docker\\Api\\Model\\VolumesPrunePostResponse200', 'json');
diff --git a/src/Exception/BadRequestException.php b/src/Exception/BadRequestException.php
new file mode 100644
index 0000000..8e3fd98
--- /dev/null
+++ b/src/Exception/BadRequestException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class BadRequestException extends \RuntimeException implements ClientException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 400);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/BuildPruneInternalServerErrorException.php b/src/Exception/BuildPruneInternalServerErrorException.php
index 107f678..23ceb38 100644
--- a/src/Exception/BuildPruneInternalServerErrorException.php
+++ b/src/Exception/BuildPruneInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class BuildPruneInternalServerErrorException extends \RuntimeException implements ServerException
+class BuildPruneInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigCreateConflictException.php b/src/Exception/ConfigCreateConflictException.php
index 2b3b24f..17838fa 100644
--- a/src/Exception/ConfigCreateConflictException.php
+++ b/src/Exception/ConfigCreateConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigCreateConflictException extends \RuntimeException implements ClientException
+class ConfigCreateConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('name conflicts with an existing object', 409);
+        parent::__construct('name conflicts with an existing object');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigCreateInternalServerErrorException.php b/src/Exception/ConfigCreateInternalServerErrorException.php
index 1ffe6de..b39efbf 100644
--- a/src/Exception/ConfigCreateInternalServerErrorException.php
+++ b/src/Exception/ConfigCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class ConfigCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigCreateServiceUnavailableException.php b/src/Exception/ConfigCreateServiceUnavailableException.php
index 127b5c2..53cdb1e 100644
--- a/src/Exception/ConfigCreateServiceUnavailableException.php
+++ b/src/Exception/ConfigCreateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigCreateServiceUnavailableException extends \RuntimeException implements ServerException
+class ConfigCreateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigDeleteInternalServerErrorException.php b/src/Exception/ConfigDeleteInternalServerErrorException.php
index dc14d25..4b7b676 100644
--- a/src/Exception/ConfigDeleteInternalServerErrorException.php
+++ b/src/Exception/ConfigDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class ConfigDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigDeleteNotFoundException.php b/src/Exception/ConfigDeleteNotFoundException.php
index 78ef3a2..a95691d 100644
--- a/src/Exception/ConfigDeleteNotFoundException.php
+++ b/src/Exception/ConfigDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigDeleteNotFoundException extends \RuntimeException implements ClientException
+class ConfigDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('config not found', 404);
+        parent::__construct('config not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigDeleteServiceUnavailableException.php b/src/Exception/ConfigDeleteServiceUnavailableException.php
index 8273496..245b0ef 100644
--- a/src/Exception/ConfigDeleteServiceUnavailableException.php
+++ b/src/Exception/ConfigDeleteServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigDeleteServiceUnavailableException extends \RuntimeException implements ServerException
+class ConfigDeleteServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigInspectInternalServerErrorException.php b/src/Exception/ConfigInspectInternalServerErrorException.php
index 09af894..158d2fb 100644
--- a/src/Exception/ConfigInspectInternalServerErrorException.php
+++ b/src/Exception/ConfigInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class ConfigInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigInspectNotFoundException.php b/src/Exception/ConfigInspectNotFoundException.php
index 4e5127c..05c2a53 100644
--- a/src/Exception/ConfigInspectNotFoundException.php
+++ b/src/Exception/ConfigInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigInspectNotFoundException extends \RuntimeException implements ClientException
+class ConfigInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('config not found', 404);
+        parent::__construct('config not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigInspectServiceUnavailableException.php b/src/Exception/ConfigInspectServiceUnavailableException.php
index a57225c..941a4c5 100644
--- a/src/Exception/ConfigInspectServiceUnavailableException.php
+++ b/src/Exception/ConfigInspectServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigInspectServiceUnavailableException extends \RuntimeException implements ServerException
+class ConfigInspectServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigListInternalServerErrorException.php b/src/Exception/ConfigListInternalServerErrorException.php
index 045a603..3de5142 100644
--- a/src/Exception/ConfigListInternalServerErrorException.php
+++ b/src/Exception/ConfigListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigListInternalServerErrorException extends \RuntimeException implements ServerException
+class ConfigListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigListServiceUnavailableException.php b/src/Exception/ConfigListServiceUnavailableException.php
index e2e05bd..0a0da27 100644
--- a/src/Exception/ConfigListServiceUnavailableException.php
+++ b/src/Exception/ConfigListServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigListServiceUnavailableException extends \RuntimeException implements ServerException
+class ConfigListServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigUpdateBadRequestException.php b/src/Exception/ConfigUpdateBadRequestException.php
index 9f6ef7e..2a89692 100644
--- a/src/Exception/ConfigUpdateBadRequestException.php
+++ b/src/Exception/ConfigUpdateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigUpdateBadRequestException extends \RuntimeException implements ClientException
+class ConfigUpdateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigUpdateInternalServerErrorException.php b/src/Exception/ConfigUpdateInternalServerErrorException.php
index fd326de..1b6365d 100644
--- a/src/Exception/ConfigUpdateInternalServerErrorException.php
+++ b/src/Exception/ConfigUpdateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigUpdateInternalServerErrorException extends \RuntimeException implements ServerException
+class ConfigUpdateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigUpdateNotFoundException.php b/src/Exception/ConfigUpdateNotFoundException.php
index 061c5bb..fae9625 100644
--- a/src/Exception/ConfigUpdateNotFoundException.php
+++ b/src/Exception/ConfigUpdateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigUpdateNotFoundException extends \RuntimeException implements ClientException
+class ConfigUpdateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such config', 404);
+        parent::__construct('no such config');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConfigUpdateServiceUnavailableException.php b/src/Exception/ConfigUpdateServiceUnavailableException.php
index 54be5eb..438a6ae 100644
--- a/src/Exception/ConfigUpdateServiceUnavailableException.php
+++ b/src/Exception/ConfigUpdateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ConfigUpdateServiceUnavailableException extends \RuntimeException implements ServerException
+class ConfigUpdateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ConflictException.php b/src/Exception/ConflictException.php
new file mode 100644
index 0000000..06c61e1
--- /dev/null
+++ b/src/Exception/ConflictException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class ConflictException extends \RuntimeException implements ClientException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 409);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/ContainerArchiveBadRequestException.php b/src/Exception/ContainerArchiveBadRequestException.php
index 3587763..25d8719 100644
--- a/src/Exception/ContainerArchiveBadRequestException.php
+++ b/src/Exception/ContainerArchiveBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerArchiveBadRequestException extends \RuntimeException implements ClientException
+class ContainerArchiveBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ContainersIdArchiveGetResponse400
+     */
     private $containersIdArchiveGetResponse400;
     public function __construct(\Docker\Api\Model\ContainersIdArchiveGetResponse400 $containersIdArchiveGetResponse400)
     {
-        parent::__construct('Bad parameter', 400);
+        parent::__construct('Bad parameter');
         $this->containersIdArchiveGetResponse400 = $containersIdArchiveGetResponse400;
     }
-    public function getContainersIdArchiveGetResponse400()
+    public function getContainersIdArchiveGetResponse400() : \Docker\Api\Model\ContainersIdArchiveGetResponse400
     {
         return $this->containersIdArchiveGetResponse400;
     }
diff --git a/src/Exception/ContainerArchiveInfoBadRequestException.php b/src/Exception/ContainerArchiveInfoBadRequestException.php
index 98e6658..d5a0438 100644
--- a/src/Exception/ContainerArchiveInfoBadRequestException.php
+++ b/src/Exception/ContainerArchiveInfoBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerArchiveInfoBadRequestException extends \RuntimeException implements ClientException
+class ContainerArchiveInfoBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ContainersIdArchiveHeadResponse400
+     */
     private $containersIdArchiveHeadResponse400;
     public function __construct(\Docker\Api\Model\ContainersIdArchiveHeadResponse400 $containersIdArchiveHeadResponse400)
     {
-        parent::__construct('Bad parameter', 400);
+        parent::__construct('Bad parameter');
         $this->containersIdArchiveHeadResponse400 = $containersIdArchiveHeadResponse400;
     }
-    public function getContainersIdArchiveHeadResponse400()
+    public function getContainersIdArchiveHeadResponse400() : \Docker\Api\Model\ContainersIdArchiveHeadResponse400
     {
         return $this->containersIdArchiveHeadResponse400;
     }
diff --git a/src/Exception/ContainerArchiveInfoInternalServerErrorException.php b/src/Exception/ContainerArchiveInfoInternalServerErrorException.php
index 52c6215..2d692bf 100644
--- a/src/Exception/ContainerArchiveInfoInternalServerErrorException.php
+++ b/src/Exception/ContainerArchiveInfoInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerArchiveInfoInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerArchiveInfoInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerArchiveInfoNotFoundException.php b/src/Exception/ContainerArchiveInfoNotFoundException.php
index c28a9fa..fad3db9 100644
--- a/src/Exception/ContainerArchiveInfoNotFoundException.php
+++ b/src/Exception/ContainerArchiveInfoNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerArchiveInfoNotFoundException extends \RuntimeException implements ClientException
+class ContainerArchiveInfoNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Container or path does not exist', 404);
+        parent::__construct('Container or path does not exist');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerArchiveInternalServerErrorException.php b/src/Exception/ContainerArchiveInternalServerErrorException.php
index e31108f..cbbeecc 100644
--- a/src/Exception/ContainerArchiveInternalServerErrorException.php
+++ b/src/Exception/ContainerArchiveInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerArchiveInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerArchiveInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerArchiveNotFoundException.php b/src/Exception/ContainerArchiveNotFoundException.php
index 26f47ac..34c287f 100644
--- a/src/Exception/ContainerArchiveNotFoundException.php
+++ b/src/Exception/ContainerArchiveNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerArchiveNotFoundException extends \RuntimeException implements ClientException
+class ContainerArchiveNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Container or path does not exist', 404);
+        parent::__construct('Container or path does not exist');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerAttachBadRequestException.php b/src/Exception/ContainerAttachBadRequestException.php
index 7b28f72..0794470 100644
--- a/src/Exception/ContainerAttachBadRequestException.php
+++ b/src/Exception/ContainerAttachBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerAttachBadRequestException extends \RuntimeException implements ClientException
+class ContainerAttachBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerAttachInternalServerErrorException.php b/src/Exception/ContainerAttachInternalServerErrorException.php
index c54e070..b2d3af9 100644
--- a/src/Exception/ContainerAttachInternalServerErrorException.php
+++ b/src/Exception/ContainerAttachInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerAttachInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerAttachInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerAttachNotFoundException.php b/src/Exception/ContainerAttachNotFoundException.php
index 872cce6..58916d9 100644
--- a/src/Exception/ContainerAttachNotFoundException.php
+++ b/src/Exception/ContainerAttachNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerAttachNotFoundException extends \RuntimeException implements ClientException
+class ContainerAttachNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerAttachWebsocketBadRequestException.php b/src/Exception/ContainerAttachWebsocketBadRequestException.php
index b964586..0c41410 100644
--- a/src/Exception/ContainerAttachWebsocketBadRequestException.php
+++ b/src/Exception/ContainerAttachWebsocketBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerAttachWebsocketBadRequestException extends \RuntimeException implements ClientException
+class ContainerAttachWebsocketBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerAttachWebsocketInternalServerErrorException.php b/src/Exception/ContainerAttachWebsocketInternalServerErrorException.php
index c14df1a..cb03c13 100644
--- a/src/Exception/ContainerAttachWebsocketInternalServerErrorException.php
+++ b/src/Exception/ContainerAttachWebsocketInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerAttachWebsocketInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerAttachWebsocketInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerAttachWebsocketNotFoundException.php b/src/Exception/ContainerAttachWebsocketNotFoundException.php
index 63086b0..2d1f45a 100644
--- a/src/Exception/ContainerAttachWebsocketNotFoundException.php
+++ b/src/Exception/ContainerAttachWebsocketNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerAttachWebsocketNotFoundException extends \RuntimeException implements ClientException
+class ContainerAttachWebsocketNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerChangesInternalServerErrorException.php b/src/Exception/ContainerChangesInternalServerErrorException.php
index a371771..af20efd 100644
--- a/src/Exception/ContainerChangesInternalServerErrorException.php
+++ b/src/Exception/ContainerChangesInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerChangesInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerChangesInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerChangesNotFoundException.php b/src/Exception/ContainerChangesNotFoundException.php
index a6408d1..847cb1c 100644
--- a/src/Exception/ContainerChangesNotFoundException.php
+++ b/src/Exception/ContainerChangesNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerChangesNotFoundException extends \RuntimeException implements ClientException
+class ContainerChangesNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerCreateBadRequestException.php b/src/Exception/ContainerCreateBadRequestException.php
index 1290c42..4154bad 100644
--- a/src/Exception/ContainerCreateBadRequestException.php
+++ b/src/Exception/ContainerCreateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerCreateBadRequestException extends \RuntimeException implements ClientException
+class ContainerCreateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerCreateConflictException.php b/src/Exception/ContainerCreateConflictException.php
index b6ebc38..a475a50 100644
--- a/src/Exception/ContainerCreateConflictException.php
+++ b/src/Exception/ContainerCreateConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerCreateConflictException extends \RuntimeException implements ClientException
+class ContainerCreateConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('conflict', 409);
+        parent::__construct('conflict');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerCreateInternalServerErrorException.php b/src/Exception/ContainerCreateInternalServerErrorException.php
index 694e005..8fb60ae 100644
--- a/src/Exception/ContainerCreateInternalServerErrorException.php
+++ b/src/Exception/ContainerCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerCreateNotFoundException.php b/src/Exception/ContainerCreateNotFoundException.php
index fbdcab0..03b3a12 100644
--- a/src/Exception/ContainerCreateNotFoundException.php
+++ b/src/Exception/ContainerCreateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerCreateNotFoundException extends \RuntimeException implements ClientException
+class ContainerCreateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerDeleteBadRequestException.php b/src/Exception/ContainerDeleteBadRequestException.php
index dd33bec..4d4264f 100644
--- a/src/Exception/ContainerDeleteBadRequestException.php
+++ b/src/Exception/ContainerDeleteBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerDeleteBadRequestException extends \RuntimeException implements ClientException
+class ContainerDeleteBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerDeleteConflictException.php b/src/Exception/ContainerDeleteConflictException.php
index 9022934..a679ae2 100644
--- a/src/Exception/ContainerDeleteConflictException.php
+++ b/src/Exception/ContainerDeleteConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerDeleteConflictException extends \RuntimeException implements ClientException
+class ContainerDeleteConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('conflict', 409);
+        parent::__construct('conflict');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerDeleteInternalServerErrorException.php b/src/Exception/ContainerDeleteInternalServerErrorException.php
index 656bfeb..0684ac1 100644
--- a/src/Exception/ContainerDeleteInternalServerErrorException.php
+++ b/src/Exception/ContainerDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerDeleteNotFoundException.php b/src/Exception/ContainerDeleteNotFoundException.php
index 51660fd..fe4eb6b 100644
--- a/src/Exception/ContainerDeleteNotFoundException.php
+++ b/src/Exception/ContainerDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerDeleteNotFoundException extends \RuntimeException implements ClientException
+class ContainerDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerExecConflictException.php b/src/Exception/ContainerExecConflictException.php
index a4f4c9c..9b87edb 100644
--- a/src/Exception/ContainerExecConflictException.php
+++ b/src/Exception/ContainerExecConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerExecConflictException extends \RuntimeException implements ClientException
+class ContainerExecConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('container is paused', 409);
+        parent::__construct('container is paused');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerExecInternalServerErrorException.php b/src/Exception/ContainerExecInternalServerErrorException.php
index 35bb5b0..be06add 100644
--- a/src/Exception/ContainerExecInternalServerErrorException.php
+++ b/src/Exception/ContainerExecInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerExecInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerExecInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerExecNotFoundException.php b/src/Exception/ContainerExecNotFoundException.php
index 6e5a22f..fdda4e8 100644
--- a/src/Exception/ContainerExecNotFoundException.php
+++ b/src/Exception/ContainerExecNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerExecNotFoundException extends \RuntimeException implements ClientException
+class ContainerExecNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerExportInternalServerErrorException.php b/src/Exception/ContainerExportInternalServerErrorException.php
index 3deaed7..2e32580 100644
--- a/src/Exception/ContainerExportInternalServerErrorException.php
+++ b/src/Exception/ContainerExportInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerExportInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerExportInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerExportNotFoundException.php b/src/Exception/ContainerExportNotFoundException.php
index 2cb92e1..d9b2fe8 100644
--- a/src/Exception/ContainerExportNotFoundException.php
+++ b/src/Exception/ContainerExportNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerExportNotFoundException extends \RuntimeException implements ClientException
+class ContainerExportNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerInspectInternalServerErrorException.php b/src/Exception/ContainerInspectInternalServerErrorException.php
index a9118a5..072cf74 100644
--- a/src/Exception/ContainerInspectInternalServerErrorException.php
+++ b/src/Exception/ContainerInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerInspectNotFoundException.php b/src/Exception/ContainerInspectNotFoundException.php
index 5d31bb8..d2d3eb3 100644
--- a/src/Exception/ContainerInspectNotFoundException.php
+++ b/src/Exception/ContainerInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerInspectNotFoundException extends \RuntimeException implements ClientException
+class ContainerInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerKillConflictException.php b/src/Exception/ContainerKillConflictException.php
index 7560d1f..e8b8d7b 100644
--- a/src/Exception/ContainerKillConflictException.php
+++ b/src/Exception/ContainerKillConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerKillConflictException extends \RuntimeException implements ClientException
+class ContainerKillConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('container is not running', 409);
+        parent::__construct('container is not running');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerKillInternalServerErrorException.php b/src/Exception/ContainerKillInternalServerErrorException.php
index 12ec4d4..1b4095e 100644
--- a/src/Exception/ContainerKillInternalServerErrorException.php
+++ b/src/Exception/ContainerKillInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerKillInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerKillInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerKillNotFoundException.php b/src/Exception/ContainerKillNotFoundException.php
index f913890..28e75ba 100644
--- a/src/Exception/ContainerKillNotFoundException.php
+++ b/src/Exception/ContainerKillNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerKillNotFoundException extends \RuntimeException implements ClientException
+class ContainerKillNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerListBadRequestException.php b/src/Exception/ContainerListBadRequestException.php
index 63ffe88..f3aa173 100644
--- a/src/Exception/ContainerListBadRequestException.php
+++ b/src/Exception/ContainerListBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerListBadRequestException extends \RuntimeException implements ClientException
+class ContainerListBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerListInternalServerErrorException.php b/src/Exception/ContainerListInternalServerErrorException.php
index 4c38249..08f1161 100644
--- a/src/Exception/ContainerListInternalServerErrorException.php
+++ b/src/Exception/ContainerListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerListInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerLogsInternalServerErrorException.php b/src/Exception/ContainerLogsInternalServerErrorException.php
index bb2c6f7..dd0171a 100644
--- a/src/Exception/ContainerLogsInternalServerErrorException.php
+++ b/src/Exception/ContainerLogsInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerLogsInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerLogsInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerLogsNotFoundException.php b/src/Exception/ContainerLogsNotFoundException.php
index 1462208..229b23e 100644
--- a/src/Exception/ContainerLogsNotFoundException.php
+++ b/src/Exception/ContainerLogsNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerLogsNotFoundException extends \RuntimeException implements ClientException
+class ContainerLogsNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerPauseInternalServerErrorException.php b/src/Exception/ContainerPauseInternalServerErrorException.php
index 7b8e299..dd3befd 100644
--- a/src/Exception/ContainerPauseInternalServerErrorException.php
+++ b/src/Exception/ContainerPauseInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerPauseInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerPauseInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerPauseNotFoundException.php b/src/Exception/ContainerPauseNotFoundException.php
index e60e9bb..173e3f3 100644
--- a/src/Exception/ContainerPauseNotFoundException.php
+++ b/src/Exception/ContainerPauseNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerPauseNotFoundException extends \RuntimeException implements ClientException
+class ContainerPauseNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerPruneInternalServerErrorException.php b/src/Exception/ContainerPruneInternalServerErrorException.php
index d0d94b5..90234d0 100644
--- a/src/Exception/ContainerPruneInternalServerErrorException.php
+++ b/src/Exception/ContainerPruneInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerPruneInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerPruneInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerRenameConflictException.php b/src/Exception/ContainerRenameConflictException.php
index 30b836c..fdcae49 100644
--- a/src/Exception/ContainerRenameConflictException.php
+++ b/src/Exception/ContainerRenameConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerRenameConflictException extends \RuntimeException implements ClientException
+class ContainerRenameConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('name already in use', 409);
+        parent::__construct('name already in use');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerRenameInternalServerErrorException.php b/src/Exception/ContainerRenameInternalServerErrorException.php
index 4e1064e..598f58c 100644
--- a/src/Exception/ContainerRenameInternalServerErrorException.php
+++ b/src/Exception/ContainerRenameInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerRenameInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerRenameInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerRenameNotFoundException.php b/src/Exception/ContainerRenameNotFoundException.php
index 9e8e8bf..454f722 100644
--- a/src/Exception/ContainerRenameNotFoundException.php
+++ b/src/Exception/ContainerRenameNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerRenameNotFoundException extends \RuntimeException implements ClientException
+class ContainerRenameNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerResizeInternalServerErrorException.php b/src/Exception/ContainerResizeInternalServerErrorException.php
index d8f4b38..0a0c46a 100644
--- a/src/Exception/ContainerResizeInternalServerErrorException.php
+++ b/src/Exception/ContainerResizeInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerResizeInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerResizeInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('cannot resize container', 500);
+        parent::__construct('cannot resize container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerResizeNotFoundException.php b/src/Exception/ContainerResizeNotFoundException.php
index c75f4bb..a9b7327 100644
--- a/src/Exception/ContainerResizeNotFoundException.php
+++ b/src/Exception/ContainerResizeNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerResizeNotFoundException extends \RuntimeException implements ClientException
+class ContainerResizeNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerRestartInternalServerErrorException.php b/src/Exception/ContainerRestartInternalServerErrorException.php
index a1bdb90..625f834 100644
--- a/src/Exception/ContainerRestartInternalServerErrorException.php
+++ b/src/Exception/ContainerRestartInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerRestartInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerRestartInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerRestartNotFoundException.php b/src/Exception/ContainerRestartNotFoundException.php
index 65337e8..868fd10 100644
--- a/src/Exception/ContainerRestartNotFoundException.php
+++ b/src/Exception/ContainerRestartNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerRestartNotFoundException extends \RuntimeException implements ClientException
+class ContainerRestartNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerStartInternalServerErrorException.php b/src/Exception/ContainerStartInternalServerErrorException.php
index 6ac298c..42878f8 100644
--- a/src/Exception/ContainerStartInternalServerErrorException.php
+++ b/src/Exception/ContainerStartInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerStartInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerStartInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerStartNotFoundException.php b/src/Exception/ContainerStartNotFoundException.php
index ce25656..6e3bb02 100644
--- a/src/Exception/ContainerStartNotFoundException.php
+++ b/src/Exception/ContainerStartNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerStartNotFoundException extends \RuntimeException implements ClientException
+class ContainerStartNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerStatsInternalServerErrorException.php b/src/Exception/ContainerStatsInternalServerErrorException.php
index 2fb582e..e443333 100644
--- a/src/Exception/ContainerStatsInternalServerErrorException.php
+++ b/src/Exception/ContainerStatsInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerStatsInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerStatsInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerStatsNotFoundException.php b/src/Exception/ContainerStatsNotFoundException.php
index 959a44b..513582d 100644
--- a/src/Exception/ContainerStatsNotFoundException.php
+++ b/src/Exception/ContainerStatsNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerStatsNotFoundException extends \RuntimeException implements ClientException
+class ContainerStatsNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerStopInternalServerErrorException.php b/src/Exception/ContainerStopInternalServerErrorException.php
index 26a703a..bfe8806 100644
--- a/src/Exception/ContainerStopInternalServerErrorException.php
+++ b/src/Exception/ContainerStopInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerStopInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerStopInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerStopNotFoundException.php b/src/Exception/ContainerStopNotFoundException.php
index 6402a2e..81e4d47 100644
--- a/src/Exception/ContainerStopNotFoundException.php
+++ b/src/Exception/ContainerStopNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerStopNotFoundException extends \RuntimeException implements ClientException
+class ContainerStopNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerTopInternalServerErrorException.php b/src/Exception/ContainerTopInternalServerErrorException.php
index 5ffa8ab..0383339 100644
--- a/src/Exception/ContainerTopInternalServerErrorException.php
+++ b/src/Exception/ContainerTopInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerTopInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerTopInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerTopNotFoundException.php b/src/Exception/ContainerTopNotFoundException.php
index a591873..5ade14d 100644
--- a/src/Exception/ContainerTopNotFoundException.php
+++ b/src/Exception/ContainerTopNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerTopNotFoundException extends \RuntimeException implements ClientException
+class ContainerTopNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerUnpauseInternalServerErrorException.php b/src/Exception/ContainerUnpauseInternalServerErrorException.php
index 87939ba..f32b2bf 100644
--- a/src/Exception/ContainerUnpauseInternalServerErrorException.php
+++ b/src/Exception/ContainerUnpauseInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerUnpauseInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerUnpauseInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerUnpauseNotFoundException.php b/src/Exception/ContainerUnpauseNotFoundException.php
index b9fa4f2..854b4c1 100644
--- a/src/Exception/ContainerUnpauseNotFoundException.php
+++ b/src/Exception/ContainerUnpauseNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerUnpauseNotFoundException extends \RuntimeException implements ClientException
+class ContainerUnpauseNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerUpdateInternalServerErrorException.php b/src/Exception/ContainerUpdateInternalServerErrorException.php
index ee96d9b..110577e 100644
--- a/src/Exception/ContainerUpdateInternalServerErrorException.php
+++ b/src/Exception/ContainerUpdateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerUpdateInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerUpdateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerUpdateNotFoundException.php b/src/Exception/ContainerUpdateNotFoundException.php
index 45903d2..a2bb0bd 100644
--- a/src/Exception/ContainerUpdateNotFoundException.php
+++ b/src/Exception/ContainerUpdateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerUpdateNotFoundException extends \RuntimeException implements ClientException
+class ContainerUpdateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerWaitInternalServerErrorException.php b/src/Exception/ContainerWaitInternalServerErrorException.php
index 2a0554f..99b4bb9 100644
--- a/src/Exception/ContainerWaitInternalServerErrorException.php
+++ b/src/Exception/ContainerWaitInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerWaitInternalServerErrorException extends \RuntimeException implements ServerException
+class ContainerWaitInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ContainerWaitNotFoundException.php b/src/Exception/ContainerWaitNotFoundException.php
index cf3161d..dd45da2 100644
--- a/src/Exception/ContainerWaitNotFoundException.php
+++ b/src/Exception/ContainerWaitNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ContainerWaitNotFoundException extends \RuntimeException implements ClientException
+class ContainerWaitNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/DistributionInspectInternalServerErrorException.php b/src/Exception/DistributionInspectInternalServerErrorException.php
index 9d7c2be..e202592 100644
--- a/src/Exception/DistributionInspectInternalServerErrorException.php
+++ b/src/Exception/DistributionInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class DistributionInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class DistributionInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/DistributionInspectUnauthorizedException.php b/src/Exception/DistributionInspectUnauthorizedException.php
index f148bdb..e592ba4 100644
--- a/src/Exception/DistributionInspectUnauthorizedException.php
+++ b/src/Exception/DistributionInspectUnauthorizedException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class DistributionInspectUnauthorizedException extends \RuntimeException implements ClientException
+class DistributionInspectUnauthorizedException extends UnauthorizedException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Failed authentication or no image found', 401);
+        parent::__construct('Failed authentication or no image found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ExecInspectInternalServerErrorException.php b/src/Exception/ExecInspectInternalServerErrorException.php
index 470f39b..d868246 100644
--- a/src/Exception/ExecInspectInternalServerErrorException.php
+++ b/src/Exception/ExecInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ExecInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class ExecInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ExecInspectNotFoundException.php b/src/Exception/ExecInspectNotFoundException.php
index ea551fb..acc014e 100644
--- a/src/Exception/ExecInspectNotFoundException.php
+++ b/src/Exception/ExecInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ExecInspectNotFoundException extends \RuntimeException implements ClientException
+class ExecInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such exec instance', 404);
+        parent::__construct('No such exec instance');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ExecResizeNotFoundException.php b/src/Exception/ExecResizeNotFoundException.php
index 67b1046..4f9005e 100644
--- a/src/Exception/ExecResizeNotFoundException.php
+++ b/src/Exception/ExecResizeNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ExecResizeNotFoundException extends \RuntimeException implements ClientException
+class ExecResizeNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such exec instance', 404);
+        parent::__construct('No such exec instance');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ExecStartConflictException.php b/src/Exception/ExecStartConflictException.php
index 40e780f..8e992ef 100644
--- a/src/Exception/ExecStartConflictException.php
+++ b/src/Exception/ExecStartConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ExecStartConflictException extends \RuntimeException implements ClientException
+class ExecStartConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Container is stopped or paused', 409);
+        parent::__construct('Container is stopped or paused');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ExecStartNotFoundException.php b/src/Exception/ExecStartNotFoundException.php
index d99224b..18abbc8 100644
--- a/src/Exception/ExecStartNotFoundException.php
+++ b/src/Exception/ExecStartNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ExecStartNotFoundException extends \RuntimeException implements ClientException
+class ExecStartNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such exec instance', 404);
+        parent::__construct('No such exec instance');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ForbiddenException.php b/src/Exception/ForbiddenException.php
new file mode 100644
index 0000000..65307b2
--- /dev/null
+++ b/src/Exception/ForbiddenException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class ForbiddenException extends \RuntimeException implements ClientException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 403);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/GetPluginPrivilegesInternalServerErrorException.php b/src/Exception/GetPluginPrivilegesInternalServerErrorException.php
index 94cefaa..3102e25 100644
--- a/src/Exception/GetPluginPrivilegesInternalServerErrorException.php
+++ b/src/Exception/GetPluginPrivilegesInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class GetPluginPrivilegesInternalServerErrorException extends \RuntimeException implements ServerException
+class GetPluginPrivilegesInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageBuildBadRequestException.php b/src/Exception/ImageBuildBadRequestException.php
index 8048bae..1b4db92 100644
--- a/src/Exception/ImageBuildBadRequestException.php
+++ b/src/Exception/ImageBuildBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageBuildBadRequestException extends \RuntimeException implements ClientException
+class ImageBuildBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Bad parameter', 400);
+        parent::__construct('Bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageBuildInternalServerErrorException.php b/src/Exception/ImageBuildInternalServerErrorException.php
index 2448bd2..18a1723 100644
--- a/src/Exception/ImageBuildInternalServerErrorException.php
+++ b/src/Exception/ImageBuildInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageBuildInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageBuildInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageCommitInternalServerErrorException.php b/src/Exception/ImageCommitInternalServerErrorException.php
index 762f600..ab485b0 100644
--- a/src/Exception/ImageCommitInternalServerErrorException.php
+++ b/src/Exception/ImageCommitInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageCommitInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageCommitInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageCommitNotFoundException.php b/src/Exception/ImageCommitNotFoundException.php
index 82890e3..0f4e8e2 100644
--- a/src/Exception/ImageCommitNotFoundException.php
+++ b/src/Exception/ImageCommitNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageCommitNotFoundException extends \RuntimeException implements ClientException
+class ImageCommitNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such container', 404);
+        parent::__construct('no such container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageCreateInternalServerErrorException.php b/src/Exception/ImageCreateInternalServerErrorException.php
index cbcb772..7a98268 100644
--- a/src/Exception/ImageCreateInternalServerErrorException.php
+++ b/src/Exception/ImageCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageCreateNotFoundException.php b/src/Exception/ImageCreateNotFoundException.php
index 47f2187..fe761cb 100644
--- a/src/Exception/ImageCreateNotFoundException.php
+++ b/src/Exception/ImageCreateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageCreateNotFoundException extends \RuntimeException implements ClientException
+class ImageCreateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('repository does not exist or no read access', 404);
+        parent::__construct('repository does not exist or no read access');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageDeleteConflictException.php b/src/Exception/ImageDeleteConflictException.php
index fce7805..9269020 100644
--- a/src/Exception/ImageDeleteConflictException.php
+++ b/src/Exception/ImageDeleteConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageDeleteConflictException extends \RuntimeException implements ClientException
+class ImageDeleteConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Conflict', 409);
+        parent::__construct('Conflict');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageDeleteInternalServerErrorException.php b/src/Exception/ImageDeleteInternalServerErrorException.php
index 57fc429..df3f87d 100644
--- a/src/Exception/ImageDeleteInternalServerErrorException.php
+++ b/src/Exception/ImageDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageDeleteNotFoundException.php b/src/Exception/ImageDeleteNotFoundException.php
index d85d3bd..416979a 100644
--- a/src/Exception/ImageDeleteNotFoundException.php
+++ b/src/Exception/ImageDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageDeleteNotFoundException extends \RuntimeException implements ClientException
+class ImageDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such image', 404);
+        parent::__construct('No such image');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageGetAllInternalServerErrorException.php b/src/Exception/ImageGetAllInternalServerErrorException.php
index 80d112e..b053482 100644
--- a/src/Exception/ImageGetAllInternalServerErrorException.php
+++ b/src/Exception/ImageGetAllInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageGetAllInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageGetAllInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageGetInternalServerErrorException.php b/src/Exception/ImageGetInternalServerErrorException.php
index 23b6ebe..d48d20c 100644
--- a/src/Exception/ImageGetInternalServerErrorException.php
+++ b/src/Exception/ImageGetInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageGetInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageGetInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageHistoryInternalServerErrorException.php b/src/Exception/ImageHistoryInternalServerErrorException.php
index d262100..d25ec9a 100644
--- a/src/Exception/ImageHistoryInternalServerErrorException.php
+++ b/src/Exception/ImageHistoryInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageHistoryInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageHistoryInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageHistoryNotFoundException.php b/src/Exception/ImageHistoryNotFoundException.php
index ec3e83e..fd187e2 100644
--- a/src/Exception/ImageHistoryNotFoundException.php
+++ b/src/Exception/ImageHistoryNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageHistoryNotFoundException extends \RuntimeException implements ClientException
+class ImageHistoryNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such image', 404);
+        parent::__construct('No such image');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageInspectInternalServerErrorException.php b/src/Exception/ImageInspectInternalServerErrorException.php
index d8c2dc9..1781265 100644
--- a/src/Exception/ImageInspectInternalServerErrorException.php
+++ b/src/Exception/ImageInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageInspectNotFoundException.php b/src/Exception/ImageInspectNotFoundException.php
index 13bc11b..dccabf8 100644
--- a/src/Exception/ImageInspectNotFoundException.php
+++ b/src/Exception/ImageInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageInspectNotFoundException extends \RuntimeException implements ClientException
+class ImageInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such image', 404);
+        parent::__construct('No such image');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageListInternalServerErrorException.php b/src/Exception/ImageListInternalServerErrorException.php
index 3567fbd..ea74bda 100644
--- a/src/Exception/ImageListInternalServerErrorException.php
+++ b/src/Exception/ImageListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageListInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageLoadInternalServerErrorException.php b/src/Exception/ImageLoadInternalServerErrorException.php
index 5b06845..0e80e1e 100644
--- a/src/Exception/ImageLoadInternalServerErrorException.php
+++ b/src/Exception/ImageLoadInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageLoadInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageLoadInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImagePruneInternalServerErrorException.php b/src/Exception/ImagePruneInternalServerErrorException.php
index aea11bf..a4a87ab 100644
--- a/src/Exception/ImagePruneInternalServerErrorException.php
+++ b/src/Exception/ImagePruneInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImagePruneInternalServerErrorException extends \RuntimeException implements ServerException
+class ImagePruneInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImagePushInternalServerErrorException.php b/src/Exception/ImagePushInternalServerErrorException.php
index a46dfec..1177110 100644
--- a/src/Exception/ImagePushInternalServerErrorException.php
+++ b/src/Exception/ImagePushInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImagePushInternalServerErrorException extends \RuntimeException implements ServerException
+class ImagePushInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImagePushNotFoundException.php b/src/Exception/ImagePushNotFoundException.php
index df3f86d..e29ef13 100644
--- a/src/Exception/ImagePushNotFoundException.php
+++ b/src/Exception/ImagePushNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImagePushNotFoundException extends \RuntimeException implements ClientException
+class ImagePushNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such image', 404);
+        parent::__construct('No such image');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageSearchInternalServerErrorException.php b/src/Exception/ImageSearchInternalServerErrorException.php
index ccbf546..2b6272f 100644
--- a/src/Exception/ImageSearchInternalServerErrorException.php
+++ b/src/Exception/ImageSearchInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageSearchInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageSearchInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageTagBadRequestException.php b/src/Exception/ImageTagBadRequestException.php
index ea1ac02..81a4240 100644
--- a/src/Exception/ImageTagBadRequestException.php
+++ b/src/Exception/ImageTagBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageTagBadRequestException extends \RuntimeException implements ClientException
+class ImageTagBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Bad parameter', 400);
+        parent::__construct('Bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageTagConflictException.php b/src/Exception/ImageTagConflictException.php
index aee6a67..47fddfb 100644
--- a/src/Exception/ImageTagConflictException.php
+++ b/src/Exception/ImageTagConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageTagConflictException extends \RuntimeException implements ClientException
+class ImageTagConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Conflict', 409);
+        parent::__construct('Conflict');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageTagInternalServerErrorException.php b/src/Exception/ImageTagInternalServerErrorException.php
index 7fe1338..88ba98c 100644
--- a/src/Exception/ImageTagInternalServerErrorException.php
+++ b/src/Exception/ImageTagInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageTagInternalServerErrorException extends \RuntimeException implements ServerException
+class ImageTagInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ImageTagNotFoundException.php b/src/Exception/ImageTagNotFoundException.php
index 55e430e..6d7291e 100644
--- a/src/Exception/ImageTagNotFoundException.php
+++ b/src/Exception/ImageTagNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ImageTagNotFoundException extends \RuntimeException implements ClientException
+class ImageTagNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such image', 404);
+        parent::__construct('No such image');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/InternalServerErrorException.php b/src/Exception/InternalServerErrorException.php
new file mode 100644
index 0000000..2944a00
--- /dev/null
+++ b/src/Exception/InternalServerErrorException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class InternalServerErrorException extends \RuntimeException implements ServerException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 500);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/NetworkConnectForbiddenException.php b/src/Exception/NetworkConnectForbiddenException.php
index b9f39fc..bf94ba3 100644
--- a/src/Exception/NetworkConnectForbiddenException.php
+++ b/src/Exception/NetworkConnectForbiddenException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkConnectForbiddenException extends \RuntimeException implements ClientException
+class NetworkConnectForbiddenException extends ForbiddenException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Operation not supported for swarm scoped networks', 403);
+        parent::__construct('Operation not supported for swarm scoped networks');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkConnectInternalServerErrorException.php b/src/Exception/NetworkConnectInternalServerErrorException.php
index 9c30616..a4ff892 100644
--- a/src/Exception/NetworkConnectInternalServerErrorException.php
+++ b/src/Exception/NetworkConnectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkConnectInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkConnectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkConnectNotFoundException.php b/src/Exception/NetworkConnectNotFoundException.php
index 902aff5..244d608 100644
--- a/src/Exception/NetworkConnectNotFoundException.php
+++ b/src/Exception/NetworkConnectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkConnectNotFoundException extends \RuntimeException implements ClientException
+class NetworkConnectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Network or container not found', 404);
+        parent::__construct('Network or container not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkCreateForbiddenException.php b/src/Exception/NetworkCreateForbiddenException.php
index 213476c..863ff98 100644
--- a/src/Exception/NetworkCreateForbiddenException.php
+++ b/src/Exception/NetworkCreateForbiddenException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkCreateForbiddenException extends \RuntimeException implements ClientException
+class NetworkCreateForbiddenException extends ForbiddenException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('operation not supported for pre-defined networks', 403);
+        parent::__construct('operation not supported for pre-defined networks');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkCreateInternalServerErrorException.php b/src/Exception/NetworkCreateInternalServerErrorException.php
index df0f889..9d5ccb0 100644
--- a/src/Exception/NetworkCreateInternalServerErrorException.php
+++ b/src/Exception/NetworkCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkCreateNotFoundException.php b/src/Exception/NetworkCreateNotFoundException.php
index db412d9..e60244c 100644
--- a/src/Exception/NetworkCreateNotFoundException.php
+++ b/src/Exception/NetworkCreateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkCreateNotFoundException extends \RuntimeException implements ClientException
+class NetworkCreateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin not found', 404);
+        parent::__construct('plugin not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkDeleteForbiddenException.php b/src/Exception/NetworkDeleteForbiddenException.php
index 8e30c84..23ddfe1 100644
--- a/src/Exception/NetworkDeleteForbiddenException.php
+++ b/src/Exception/NetworkDeleteForbiddenException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkDeleteForbiddenException extends \RuntimeException implements ClientException
+class NetworkDeleteForbiddenException extends ForbiddenException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('operation not supported for pre-defined networks', 403);
+        parent::__construct('operation not supported for pre-defined networks');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkDeleteInternalServerErrorException.php b/src/Exception/NetworkDeleteInternalServerErrorException.php
index 767cab2..56eca84 100644
--- a/src/Exception/NetworkDeleteInternalServerErrorException.php
+++ b/src/Exception/NetworkDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkDeleteNotFoundException.php b/src/Exception/NetworkDeleteNotFoundException.php
index 9df06ac..f1d0228 100644
--- a/src/Exception/NetworkDeleteNotFoundException.php
+++ b/src/Exception/NetworkDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkDeleteNotFoundException extends \RuntimeException implements ClientException
+class NetworkDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such network', 404);
+        parent::__construct('no such network');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkDisconnectForbiddenException.php b/src/Exception/NetworkDisconnectForbiddenException.php
index 72be014..786c6fc 100644
--- a/src/Exception/NetworkDisconnectForbiddenException.php
+++ b/src/Exception/NetworkDisconnectForbiddenException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkDisconnectForbiddenException extends \RuntimeException implements ClientException
+class NetworkDisconnectForbiddenException extends ForbiddenException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Operation not supported for swarm scoped networks', 403);
+        parent::__construct('Operation not supported for swarm scoped networks');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkDisconnectInternalServerErrorException.php b/src/Exception/NetworkDisconnectInternalServerErrorException.php
index 06ce486..012c7fd 100644
--- a/src/Exception/NetworkDisconnectInternalServerErrorException.php
+++ b/src/Exception/NetworkDisconnectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkDisconnectInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkDisconnectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkDisconnectNotFoundException.php b/src/Exception/NetworkDisconnectNotFoundException.php
index 5a59b28..93cbc76 100644
--- a/src/Exception/NetworkDisconnectNotFoundException.php
+++ b/src/Exception/NetworkDisconnectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkDisconnectNotFoundException extends \RuntimeException implements ClientException
+class NetworkDisconnectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Network or container not found', 404);
+        parent::__construct('Network or container not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkInspectInternalServerErrorException.php b/src/Exception/NetworkInspectInternalServerErrorException.php
index 8432e31..c6f4a98 100644
--- a/src/Exception/NetworkInspectInternalServerErrorException.php
+++ b/src/Exception/NetworkInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkInspectNotFoundException.php b/src/Exception/NetworkInspectNotFoundException.php
index f2919ac..94ec755 100644
--- a/src/Exception/NetworkInspectNotFoundException.php
+++ b/src/Exception/NetworkInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkInspectNotFoundException extends \RuntimeException implements ClientException
+class NetworkInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Network not found', 404);
+        parent::__construct('Network not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkListInternalServerErrorException.php b/src/Exception/NetworkListInternalServerErrorException.php
index f8114e6..5d8621f 100644
--- a/src/Exception/NetworkListInternalServerErrorException.php
+++ b/src/Exception/NetworkListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkListInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NetworkPruneInternalServerErrorException.php b/src/Exception/NetworkPruneInternalServerErrorException.php
index 42fd539..de1c21d 100644
--- a/src/Exception/NetworkPruneInternalServerErrorException.php
+++ b/src/Exception/NetworkPruneInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NetworkPruneInternalServerErrorException extends \RuntimeException implements ServerException
+class NetworkPruneInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeDeleteInternalServerErrorException.php b/src/Exception/NodeDeleteInternalServerErrorException.php
index 096c8bc..f1ddcc5 100644
--- a/src/Exception/NodeDeleteInternalServerErrorException.php
+++ b/src/Exception/NodeDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class NodeDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeDeleteNotFoundException.php b/src/Exception/NodeDeleteNotFoundException.php
index 16f6a0f..c460888 100644
--- a/src/Exception/NodeDeleteNotFoundException.php
+++ b/src/Exception/NodeDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeDeleteNotFoundException extends \RuntimeException implements ClientException
+class NodeDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such node', 404);
+        parent::__construct('no such node');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeDeleteServiceUnavailableException.php b/src/Exception/NodeDeleteServiceUnavailableException.php
index 04e56cd..aa2b58b 100644
--- a/src/Exception/NodeDeleteServiceUnavailableException.php
+++ b/src/Exception/NodeDeleteServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeDeleteServiceUnavailableException extends \RuntimeException implements ServerException
+class NodeDeleteServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeInspectInternalServerErrorException.php b/src/Exception/NodeInspectInternalServerErrorException.php
index ed84d41..e858b4d 100644
--- a/src/Exception/NodeInspectInternalServerErrorException.php
+++ b/src/Exception/NodeInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class NodeInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeInspectNotFoundException.php b/src/Exception/NodeInspectNotFoundException.php
index 508b25d..b9bec2e 100644
--- a/src/Exception/NodeInspectNotFoundException.php
+++ b/src/Exception/NodeInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeInspectNotFoundException extends \RuntimeException implements ClientException
+class NodeInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such node', 404);
+        parent::__construct('no such node');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeInspectServiceUnavailableException.php b/src/Exception/NodeInspectServiceUnavailableException.php
index 63b18fe..a1e8246 100644
--- a/src/Exception/NodeInspectServiceUnavailableException.php
+++ b/src/Exception/NodeInspectServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeInspectServiceUnavailableException extends \RuntimeException implements ServerException
+class NodeInspectServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeListInternalServerErrorException.php b/src/Exception/NodeListInternalServerErrorException.php
index 5387ef0..cd5f1e4 100644
--- a/src/Exception/NodeListInternalServerErrorException.php
+++ b/src/Exception/NodeListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeListInternalServerErrorException extends \RuntimeException implements ServerException
+class NodeListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeListServiceUnavailableException.php b/src/Exception/NodeListServiceUnavailableException.php
index 1f611c7..8565a82 100644
--- a/src/Exception/NodeListServiceUnavailableException.php
+++ b/src/Exception/NodeListServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeListServiceUnavailableException extends \RuntimeException implements ServerException
+class NodeListServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeUpdateBadRequestException.php b/src/Exception/NodeUpdateBadRequestException.php
index 9dd1af8..bd5bd14 100644
--- a/src/Exception/NodeUpdateBadRequestException.php
+++ b/src/Exception/NodeUpdateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeUpdateBadRequestException extends \RuntimeException implements ClientException
+class NodeUpdateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeUpdateInternalServerErrorException.php b/src/Exception/NodeUpdateInternalServerErrorException.php
index 4ac052d..30c178d 100644
--- a/src/Exception/NodeUpdateInternalServerErrorException.php
+++ b/src/Exception/NodeUpdateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeUpdateInternalServerErrorException extends \RuntimeException implements ServerException
+class NodeUpdateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeUpdateNotFoundException.php b/src/Exception/NodeUpdateNotFoundException.php
index 245871d..c17a89c 100644
--- a/src/Exception/NodeUpdateNotFoundException.php
+++ b/src/Exception/NodeUpdateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeUpdateNotFoundException extends \RuntimeException implements ClientException
+class NodeUpdateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such node', 404);
+        parent::__construct('no such node');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NodeUpdateServiceUnavailableException.php b/src/Exception/NodeUpdateServiceUnavailableException.php
index 8ab6fa0..56aeb04 100644
--- a/src/Exception/NodeUpdateServiceUnavailableException.php
+++ b/src/Exception/NodeUpdateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class NodeUpdateServiceUnavailableException extends \RuntimeException implements ServerException
+class NodeUpdateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/NotFoundException.php b/src/Exception/NotFoundException.php
new file mode 100644
index 0000000..0f14787
--- /dev/null
+++ b/src/Exception/NotFoundException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class NotFoundException extends \RuntimeException implements ClientException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 404);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/PluginCreateInternalServerErrorException.php b/src/Exception/PluginCreateInternalServerErrorException.php
index 72b639b..aee2bee 100644
--- a/src/Exception/PluginCreateInternalServerErrorException.php
+++ b/src/Exception/PluginCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginDeleteInternalServerErrorException.php b/src/Exception/PluginDeleteInternalServerErrorException.php
index cb5fe65..ff221ac 100644
--- a/src/Exception/PluginDeleteInternalServerErrorException.php
+++ b/src/Exception/PluginDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginDeleteNotFoundException.php b/src/Exception/PluginDeleteNotFoundException.php
index e0c7280..f417ce6 100644
--- a/src/Exception/PluginDeleteNotFoundException.php
+++ b/src/Exception/PluginDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginDeleteNotFoundException extends \RuntimeException implements ClientException
+class PluginDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin is not installed', 404);
+        parent::__construct('plugin is not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginDisableInternalServerErrorException.php b/src/Exception/PluginDisableInternalServerErrorException.php
index eac4613..1167c31 100644
--- a/src/Exception/PluginDisableInternalServerErrorException.php
+++ b/src/Exception/PluginDisableInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginDisableInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginDisableInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginDisableNotFoundException.php b/src/Exception/PluginDisableNotFoundException.php
index 061a366..bee5622 100644
--- a/src/Exception/PluginDisableNotFoundException.php
+++ b/src/Exception/PluginDisableNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginDisableNotFoundException extends \RuntimeException implements ClientException
+class PluginDisableNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin is not installed', 404);
+        parent::__construct('plugin is not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginEnableInternalServerErrorException.php b/src/Exception/PluginEnableInternalServerErrorException.php
index 6481540..603cb6f 100644
--- a/src/Exception/PluginEnableInternalServerErrorException.php
+++ b/src/Exception/PluginEnableInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginEnableInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginEnableInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginEnableNotFoundException.php b/src/Exception/PluginEnableNotFoundException.php
index e5c6cd0..5dc29b4 100644
--- a/src/Exception/PluginEnableNotFoundException.php
+++ b/src/Exception/PluginEnableNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginEnableNotFoundException extends \RuntimeException implements ClientException
+class PluginEnableNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin is not installed', 404);
+        parent::__construct('plugin is not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginInspectInternalServerErrorException.php b/src/Exception/PluginInspectInternalServerErrorException.php
index d22e20a..b746492 100644
--- a/src/Exception/PluginInspectInternalServerErrorException.php
+++ b/src/Exception/PluginInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginInspectNotFoundException.php b/src/Exception/PluginInspectNotFoundException.php
index 25f7bd5..a58304b 100644
--- a/src/Exception/PluginInspectNotFoundException.php
+++ b/src/Exception/PluginInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginInspectNotFoundException extends \RuntimeException implements ClientException
+class PluginInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin is not installed', 404);
+        parent::__construct('plugin is not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginListInternalServerErrorException.php b/src/Exception/PluginListInternalServerErrorException.php
index e57ae3f..ae80e45 100644
--- a/src/Exception/PluginListInternalServerErrorException.php
+++ b/src/Exception/PluginListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginListInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginPullInternalServerErrorException.php b/src/Exception/PluginPullInternalServerErrorException.php
index f7eb589..6b88962 100644
--- a/src/Exception/PluginPullInternalServerErrorException.php
+++ b/src/Exception/PluginPullInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginPullInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginPullInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginPushInternalServerErrorException.php b/src/Exception/PluginPushInternalServerErrorException.php
index 1a34998..0c40242 100644
--- a/src/Exception/PluginPushInternalServerErrorException.php
+++ b/src/Exception/PluginPushInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginPushInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginPushInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginPushNotFoundException.php b/src/Exception/PluginPushNotFoundException.php
index 013d68a..aab59b3 100644
--- a/src/Exception/PluginPushNotFoundException.php
+++ b/src/Exception/PluginPushNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginPushNotFoundException extends \RuntimeException implements ClientException
+class PluginPushNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin not installed', 404);
+        parent::__construct('plugin not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginSetInternalServerErrorException.php b/src/Exception/PluginSetInternalServerErrorException.php
index 85f7959..ecb4c59 100644
--- a/src/Exception/PluginSetInternalServerErrorException.php
+++ b/src/Exception/PluginSetInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginSetInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginSetInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginSetNotFoundException.php b/src/Exception/PluginSetNotFoundException.php
index 8c687b4..2bb65f3 100644
--- a/src/Exception/PluginSetNotFoundException.php
+++ b/src/Exception/PluginSetNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginSetNotFoundException extends \RuntimeException implements ClientException
+class PluginSetNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Plugin not installed', 404);
+        parent::__construct('Plugin not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginUpgradeInternalServerErrorException.php b/src/Exception/PluginUpgradeInternalServerErrorException.php
index a6d1586..0fd9c76 100644
--- a/src/Exception/PluginUpgradeInternalServerErrorException.php
+++ b/src/Exception/PluginUpgradeInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginUpgradeInternalServerErrorException extends \RuntimeException implements ServerException
+class PluginUpgradeInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PluginUpgradeNotFoundException.php b/src/Exception/PluginUpgradeNotFoundException.php
index 3793597..cba05d5 100644
--- a/src/Exception/PluginUpgradeNotFoundException.php
+++ b/src/Exception/PluginUpgradeNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PluginUpgradeNotFoundException extends \RuntimeException implements ClientException
+class PluginUpgradeNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('plugin not installed', 404);
+        parent::__construct('plugin not installed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PutContainerArchiveBadRequestException.php b/src/Exception/PutContainerArchiveBadRequestException.php
index f4b59a4..3458cfa 100644
--- a/src/Exception/PutContainerArchiveBadRequestException.php
+++ b/src/Exception/PutContainerArchiveBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PutContainerArchiveBadRequestException extends \RuntimeException implements ClientException
+class PutContainerArchiveBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Bad parameter', 400);
+        parent::__construct('Bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PutContainerArchiveForbiddenException.php b/src/Exception/PutContainerArchiveForbiddenException.php
index f1a797a..f2e81b4 100644
--- a/src/Exception/PutContainerArchiveForbiddenException.php
+++ b/src/Exception/PutContainerArchiveForbiddenException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PutContainerArchiveForbiddenException extends \RuntimeException implements ClientException
+class PutContainerArchiveForbiddenException extends ForbiddenException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Permission denied, the volume or container rootfs is marked as read-only.', 403);
+        parent::__construct('Permission denied, the volume or container rootfs is marked as read-only.');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PutContainerArchiveInternalServerErrorException.php b/src/Exception/PutContainerArchiveInternalServerErrorException.php
index 8252050..f60ef88 100644
--- a/src/Exception/PutContainerArchiveInternalServerErrorException.php
+++ b/src/Exception/PutContainerArchiveInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PutContainerArchiveInternalServerErrorException extends \RuntimeException implements ServerException
+class PutContainerArchiveInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/PutContainerArchiveNotFoundException.php b/src/Exception/PutContainerArchiveNotFoundException.php
index ec3fbb6..a026b54 100644
--- a/src/Exception/PutContainerArchiveNotFoundException.php
+++ b/src/Exception/PutContainerArchiveNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class PutContainerArchiveNotFoundException extends \RuntimeException implements ClientException
+class PutContainerArchiveNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such container or path does not exist inside the container', 404);
+        parent::__construct('No such container or path does not exist inside the container');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretCreateConflictException.php b/src/Exception/SecretCreateConflictException.php
index ab70811..0e00451 100644
--- a/src/Exception/SecretCreateConflictException.php
+++ b/src/Exception/SecretCreateConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretCreateConflictException extends \RuntimeException implements ClientException
+class SecretCreateConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('name conflicts with an existing object', 409);
+        parent::__construct('name conflicts with an existing object');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretCreateInternalServerErrorException.php b/src/Exception/SecretCreateInternalServerErrorException.php
index de13a4b..f736751 100644
--- a/src/Exception/SecretCreateInternalServerErrorException.php
+++ b/src/Exception/SecretCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class SecretCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretCreateServiceUnavailableException.php b/src/Exception/SecretCreateServiceUnavailableException.php
index f00f363..f60db83 100644
--- a/src/Exception/SecretCreateServiceUnavailableException.php
+++ b/src/Exception/SecretCreateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretCreateServiceUnavailableException extends \RuntimeException implements ServerException
+class SecretCreateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretDeleteInternalServerErrorException.php b/src/Exception/SecretDeleteInternalServerErrorException.php
index 58af996..e53e252 100644
--- a/src/Exception/SecretDeleteInternalServerErrorException.php
+++ b/src/Exception/SecretDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class SecretDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretDeleteNotFoundException.php b/src/Exception/SecretDeleteNotFoundException.php
index 4a5bdbf..ddb41b9 100644
--- a/src/Exception/SecretDeleteNotFoundException.php
+++ b/src/Exception/SecretDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretDeleteNotFoundException extends \RuntimeException implements ClientException
+class SecretDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('secret not found', 404);
+        parent::__construct('secret not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretDeleteServiceUnavailableException.php b/src/Exception/SecretDeleteServiceUnavailableException.php
index f262da4..eec3743 100644
--- a/src/Exception/SecretDeleteServiceUnavailableException.php
+++ b/src/Exception/SecretDeleteServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretDeleteServiceUnavailableException extends \RuntimeException implements ServerException
+class SecretDeleteServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretInspectInternalServerErrorException.php b/src/Exception/SecretInspectInternalServerErrorException.php
index 17faa6b..13b2ef2 100644
--- a/src/Exception/SecretInspectInternalServerErrorException.php
+++ b/src/Exception/SecretInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class SecretInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretInspectNotFoundException.php b/src/Exception/SecretInspectNotFoundException.php
index f59df3b..c24f9d5 100644
--- a/src/Exception/SecretInspectNotFoundException.php
+++ b/src/Exception/SecretInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretInspectNotFoundException extends \RuntimeException implements ClientException
+class SecretInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('secret not found', 404);
+        parent::__construct('secret not found');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretInspectServiceUnavailableException.php b/src/Exception/SecretInspectServiceUnavailableException.php
index a2c656e..2341ef7 100644
--- a/src/Exception/SecretInspectServiceUnavailableException.php
+++ b/src/Exception/SecretInspectServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretInspectServiceUnavailableException extends \RuntimeException implements ServerException
+class SecretInspectServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretListInternalServerErrorException.php b/src/Exception/SecretListInternalServerErrorException.php
index 79a9442..390f4f0 100644
--- a/src/Exception/SecretListInternalServerErrorException.php
+++ b/src/Exception/SecretListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretListInternalServerErrorException extends \RuntimeException implements ServerException
+class SecretListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretListServiceUnavailableException.php b/src/Exception/SecretListServiceUnavailableException.php
index b7003fd..7712f34 100644
--- a/src/Exception/SecretListServiceUnavailableException.php
+++ b/src/Exception/SecretListServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretListServiceUnavailableException extends \RuntimeException implements ServerException
+class SecretListServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretUpdateBadRequestException.php b/src/Exception/SecretUpdateBadRequestException.php
index 28e132d..5b69058 100644
--- a/src/Exception/SecretUpdateBadRequestException.php
+++ b/src/Exception/SecretUpdateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretUpdateBadRequestException extends \RuntimeException implements ClientException
+class SecretUpdateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretUpdateInternalServerErrorException.php b/src/Exception/SecretUpdateInternalServerErrorException.php
index 23e1c67..7fec442 100644
--- a/src/Exception/SecretUpdateInternalServerErrorException.php
+++ b/src/Exception/SecretUpdateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretUpdateInternalServerErrorException extends \RuntimeException implements ServerException
+class SecretUpdateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretUpdateNotFoundException.php b/src/Exception/SecretUpdateNotFoundException.php
index ef470b4..e583d07 100644
--- a/src/Exception/SecretUpdateNotFoundException.php
+++ b/src/Exception/SecretUpdateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretUpdateNotFoundException extends \RuntimeException implements ClientException
+class SecretUpdateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such secret', 404);
+        parent::__construct('no such secret');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SecretUpdateServiceUnavailableException.php b/src/Exception/SecretUpdateServiceUnavailableException.php
index fe07da1..b8009d8 100644
--- a/src/Exception/SecretUpdateServiceUnavailableException.php
+++ b/src/Exception/SecretUpdateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SecretUpdateServiceUnavailableException extends \RuntimeException implements ServerException
+class SecretUpdateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceCreateBadRequestException.php b/src/Exception/ServiceCreateBadRequestException.php
index 4900163..7346a1e 100644
--- a/src/Exception/ServiceCreateBadRequestException.php
+++ b/src/Exception/ServiceCreateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceCreateBadRequestException extends \RuntimeException implements ClientException
+class ServiceCreateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceCreateConflictException.php b/src/Exception/ServiceCreateConflictException.php
index 0525017..02e494c 100644
--- a/src/Exception/ServiceCreateConflictException.php
+++ b/src/Exception/ServiceCreateConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceCreateConflictException extends \RuntimeException implements ClientException
+class ServiceCreateConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('name conflicts with an existing service', 409);
+        parent::__construct('name conflicts with an existing service');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceCreateForbiddenException.php b/src/Exception/ServiceCreateForbiddenException.php
index a6fa867..657a521 100644
--- a/src/Exception/ServiceCreateForbiddenException.php
+++ b/src/Exception/ServiceCreateForbiddenException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceCreateForbiddenException extends \RuntimeException implements ClientException
+class ServiceCreateForbiddenException extends ForbiddenException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('network is not eligible for services', 403);
+        parent::__construct('network is not eligible for services');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceCreateInternalServerErrorException.php b/src/Exception/ServiceCreateInternalServerErrorException.php
index 7c84e4c..4838674 100644
--- a/src/Exception/ServiceCreateInternalServerErrorException.php
+++ b/src/Exception/ServiceCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class ServiceCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceCreateServiceUnavailableException.php b/src/Exception/ServiceCreateServiceUnavailableException.php
index f9af457..bebe87c 100644
--- a/src/Exception/ServiceCreateServiceUnavailableException.php
+++ b/src/Exception/ServiceCreateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceCreateServiceUnavailableException extends \RuntimeException implements ServerException
+class ServiceCreateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceDeleteInternalServerErrorException.php b/src/Exception/ServiceDeleteInternalServerErrorException.php
index 3fdc785..33292c7 100644
--- a/src/Exception/ServiceDeleteInternalServerErrorException.php
+++ b/src/Exception/ServiceDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class ServiceDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceDeleteNotFoundException.php b/src/Exception/ServiceDeleteNotFoundException.php
index 1b56771..265239a 100644
--- a/src/Exception/ServiceDeleteNotFoundException.php
+++ b/src/Exception/ServiceDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceDeleteNotFoundException extends \RuntimeException implements ClientException
+class ServiceDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such service', 404);
+        parent::__construct('no such service');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceDeleteServiceUnavailableException.php b/src/Exception/ServiceDeleteServiceUnavailableException.php
index ad0d7c5..67d4b21 100644
--- a/src/Exception/ServiceDeleteServiceUnavailableException.php
+++ b/src/Exception/ServiceDeleteServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceDeleteServiceUnavailableException extends \RuntimeException implements ServerException
+class ServiceDeleteServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceInspectInternalServerErrorException.php b/src/Exception/ServiceInspectInternalServerErrorException.php
index 1561349..927fab5 100644
--- a/src/Exception/ServiceInspectInternalServerErrorException.php
+++ b/src/Exception/ServiceInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class ServiceInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceInspectNotFoundException.php b/src/Exception/ServiceInspectNotFoundException.php
index afea4f3..416d3cc 100644
--- a/src/Exception/ServiceInspectNotFoundException.php
+++ b/src/Exception/ServiceInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceInspectNotFoundException extends \RuntimeException implements ClientException
+class ServiceInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such service', 404);
+        parent::__construct('no such service');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceInspectServiceUnavailableException.php b/src/Exception/ServiceInspectServiceUnavailableException.php
index 07d4708..3f8ae5e 100644
--- a/src/Exception/ServiceInspectServiceUnavailableException.php
+++ b/src/Exception/ServiceInspectServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceInspectServiceUnavailableException extends \RuntimeException implements ServerException
+class ServiceInspectServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceListInternalServerErrorException.php b/src/Exception/ServiceListInternalServerErrorException.php
index 9c76de9..2b0d7da 100644
--- a/src/Exception/ServiceListInternalServerErrorException.php
+++ b/src/Exception/ServiceListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceListInternalServerErrorException extends \RuntimeException implements ServerException
+class ServiceListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceListServiceUnavailableException.php b/src/Exception/ServiceListServiceUnavailableException.php
index 2aba594..a7e08c1 100644
--- a/src/Exception/ServiceListServiceUnavailableException.php
+++ b/src/Exception/ServiceListServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceListServiceUnavailableException extends \RuntimeException implements ServerException
+class ServiceListServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceLogsInternalServerErrorException.php b/src/Exception/ServiceLogsInternalServerErrorException.php
index 31980fc..bd9beaa 100644
--- a/src/Exception/ServiceLogsInternalServerErrorException.php
+++ b/src/Exception/ServiceLogsInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceLogsInternalServerErrorException extends \RuntimeException implements ServerException
+class ServiceLogsInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceLogsNotFoundException.php b/src/Exception/ServiceLogsNotFoundException.php
index 34faffb..3f5b685 100644
--- a/src/Exception/ServiceLogsNotFoundException.php
+++ b/src/Exception/ServiceLogsNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceLogsNotFoundException extends \RuntimeException implements ClientException
+class ServiceLogsNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such service', 404);
+        parent::__construct('no such service');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceLogsServiceUnavailableException.php b/src/Exception/ServiceLogsServiceUnavailableException.php
index 0f484ad..fbe9818 100644
--- a/src/Exception/ServiceLogsServiceUnavailableException.php
+++ b/src/Exception/ServiceLogsServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceLogsServiceUnavailableException extends \RuntimeException implements ServerException
+class ServiceLogsServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceUnavailableException.php b/src/Exception/ServiceUnavailableException.php
new file mode 100644
index 0000000..0a54b48
--- /dev/null
+++ b/src/Exception/ServiceUnavailableException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class ServiceUnavailableException extends \RuntimeException implements ServerException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 503);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/ServiceUpdateBadRequestException.php b/src/Exception/ServiceUpdateBadRequestException.php
index 758c582..b71b8d9 100644
--- a/src/Exception/ServiceUpdateBadRequestException.php
+++ b/src/Exception/ServiceUpdateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceUpdateBadRequestException extends \RuntimeException implements ClientException
+class ServiceUpdateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceUpdateInternalServerErrorException.php b/src/Exception/ServiceUpdateInternalServerErrorException.php
index f37c999..c623a1e 100644
--- a/src/Exception/ServiceUpdateInternalServerErrorException.php
+++ b/src/Exception/ServiceUpdateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceUpdateInternalServerErrorException extends \RuntimeException implements ServerException
+class ServiceUpdateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceUpdateNotFoundException.php b/src/Exception/ServiceUpdateNotFoundException.php
index bcbf240..9280352 100644
--- a/src/Exception/ServiceUpdateNotFoundException.php
+++ b/src/Exception/ServiceUpdateNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceUpdateNotFoundException extends \RuntimeException implements ClientException
+class ServiceUpdateNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such service', 404);
+        parent::__construct('no such service');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/ServiceUpdateServiceUnavailableException.php b/src/Exception/ServiceUpdateServiceUnavailableException.php
index 593dc96..8cab16f 100644
--- a/src/Exception/ServiceUpdateServiceUnavailableException.php
+++ b/src/Exception/ServiceUpdateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class ServiceUpdateServiceUnavailableException extends \RuntimeException implements ServerException
+class ServiceUpdateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SessionBadRequestException.php b/src/Exception/SessionBadRequestException.php
index fdd1a4a..6d97ebf 100644
--- a/src/Exception/SessionBadRequestException.php
+++ b/src/Exception/SessionBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SessionBadRequestException extends \RuntimeException implements ClientException
+class SessionBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SessionInternalServerErrorException.php b/src/Exception/SessionInternalServerErrorException.php
index 4fda187..4c4cecf 100644
--- a/src/Exception/SessionInternalServerErrorException.php
+++ b/src/Exception/SessionInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SessionInternalServerErrorException extends \RuntimeException implements ServerException
+class SessionInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmInitBadRequestException.php b/src/Exception/SwarmInitBadRequestException.php
index 31af945..62e44a6 100644
--- a/src/Exception/SwarmInitBadRequestException.php
+++ b/src/Exception/SwarmInitBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmInitBadRequestException extends \RuntimeException implements ClientException
+class SwarmInitBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmInitInternalServerErrorException.php b/src/Exception/SwarmInitInternalServerErrorException.php
index bd2c5b4..d92198c 100644
--- a/src/Exception/SwarmInitInternalServerErrorException.php
+++ b/src/Exception/SwarmInitInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmInitInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmInitInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmInitServiceUnavailableException.php b/src/Exception/SwarmInitServiceUnavailableException.php
index 7fe9ef2..c19fbba 100644
--- a/src/Exception/SwarmInitServiceUnavailableException.php
+++ b/src/Exception/SwarmInitServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmInitServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmInitServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is already part of a swarm', 503);
+        parent::__construct('node is already part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmInspectInternalServerErrorException.php b/src/Exception/SwarmInspectInternalServerErrorException.php
index c5fb13e..7566e1c 100644
--- a/src/Exception/SwarmInspectInternalServerErrorException.php
+++ b/src/Exception/SwarmInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmInspectNotFoundException.php b/src/Exception/SwarmInspectNotFoundException.php
index 831319e..011bddd 100644
--- a/src/Exception/SwarmInspectNotFoundException.php
+++ b/src/Exception/SwarmInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmInspectNotFoundException extends \RuntimeException implements ClientException
+class SwarmInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such swarm', 404);
+        parent::__construct('no such swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmInspectServiceUnavailableException.php b/src/Exception/SwarmInspectServiceUnavailableException.php
index d067d6c..1297fc9 100644
--- a/src/Exception/SwarmInspectServiceUnavailableException.php
+++ b/src/Exception/SwarmInspectServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmInspectServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmInspectServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmJoinBadRequestException.php b/src/Exception/SwarmJoinBadRequestException.php
index dc0676a..cd9d65e 100644
--- a/src/Exception/SwarmJoinBadRequestException.php
+++ b/src/Exception/SwarmJoinBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmJoinBadRequestException extends \RuntimeException implements ClientException
+class SwarmJoinBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmJoinInternalServerErrorException.php b/src/Exception/SwarmJoinInternalServerErrorException.php
index 85e0cb4..7b4c09b 100644
--- a/src/Exception/SwarmJoinInternalServerErrorException.php
+++ b/src/Exception/SwarmJoinInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmJoinInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmJoinInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmJoinServiceUnavailableException.php b/src/Exception/SwarmJoinServiceUnavailableException.php
index cfa8710..921bfcf 100644
--- a/src/Exception/SwarmJoinServiceUnavailableException.php
+++ b/src/Exception/SwarmJoinServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmJoinServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmJoinServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is already part of a swarm', 503);
+        parent::__construct('node is already part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmLeaveInternalServerErrorException.php b/src/Exception/SwarmLeaveInternalServerErrorException.php
index 589d75d..6dd0ce7 100644
--- a/src/Exception/SwarmLeaveInternalServerErrorException.php
+++ b/src/Exception/SwarmLeaveInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmLeaveInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmLeaveInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmLeaveServiceUnavailableException.php b/src/Exception/SwarmLeaveServiceUnavailableException.php
index 0f345b5..a0505fb 100644
--- a/src/Exception/SwarmLeaveServiceUnavailableException.php
+++ b/src/Exception/SwarmLeaveServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmLeaveServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmLeaveServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUnlockInternalServerErrorException.php b/src/Exception/SwarmUnlockInternalServerErrorException.php
index 31e27ca..7a5b0a7 100644
--- a/src/Exception/SwarmUnlockInternalServerErrorException.php
+++ b/src/Exception/SwarmUnlockInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUnlockInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmUnlockInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUnlockServiceUnavailableException.php b/src/Exception/SwarmUnlockServiceUnavailableException.php
index 1b8f4b6..57c151a 100644
--- a/src/Exception/SwarmUnlockServiceUnavailableException.php
+++ b/src/Exception/SwarmUnlockServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUnlockServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmUnlockServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUnlockkeyInternalServerErrorException.php b/src/Exception/SwarmUnlockkeyInternalServerErrorException.php
index 6400d93..6286b64 100644
--- a/src/Exception/SwarmUnlockkeyInternalServerErrorException.php
+++ b/src/Exception/SwarmUnlockkeyInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUnlockkeyInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmUnlockkeyInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUnlockkeyServiceUnavailableException.php b/src/Exception/SwarmUnlockkeyServiceUnavailableException.php
index 341eed4..1eda2eb 100644
--- a/src/Exception/SwarmUnlockkeyServiceUnavailableException.php
+++ b/src/Exception/SwarmUnlockkeyServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUnlockkeyServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmUnlockkeyServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUpdateBadRequestException.php b/src/Exception/SwarmUpdateBadRequestException.php
index 49f3c2e..1559682 100644
--- a/src/Exception/SwarmUpdateBadRequestException.php
+++ b/src/Exception/SwarmUpdateBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUpdateBadRequestException extends \RuntimeException implements ClientException
+class SwarmUpdateBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUpdateInternalServerErrorException.php b/src/Exception/SwarmUpdateInternalServerErrorException.php
index 38e6d09..c6771a1 100644
--- a/src/Exception/SwarmUpdateInternalServerErrorException.php
+++ b/src/Exception/SwarmUpdateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUpdateInternalServerErrorException extends \RuntimeException implements ServerException
+class SwarmUpdateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SwarmUpdateServiceUnavailableException.php b/src/Exception/SwarmUpdateServiceUnavailableException.php
index d7b9f1a..183807d 100644
--- a/src/Exception/SwarmUpdateServiceUnavailableException.php
+++ b/src/Exception/SwarmUpdateServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SwarmUpdateServiceUnavailableException extends \RuntimeException implements ServerException
+class SwarmUpdateServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemAuthInternalServerErrorException.php b/src/Exception/SystemAuthInternalServerErrorException.php
index 354dfdf..ede5e0e 100644
--- a/src/Exception/SystemAuthInternalServerErrorException.php
+++ b/src/Exception/SystemAuthInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemAuthInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemAuthInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemDataUsageInternalServerErrorException.php b/src/Exception/SystemDataUsageInternalServerErrorException.php
index 4ae09d8..3f9a2e0 100644
--- a/src/Exception/SystemDataUsageInternalServerErrorException.php
+++ b/src/Exception/SystemDataUsageInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemDataUsageInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemDataUsageInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemEventsBadRequestException.php b/src/Exception/SystemEventsBadRequestException.php
index 5288c93..1e10bee 100644
--- a/src/Exception/SystemEventsBadRequestException.php
+++ b/src/Exception/SystemEventsBadRequestException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemEventsBadRequestException extends \RuntimeException implements ClientException
+class SystemEventsBadRequestException extends BadRequestException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('bad parameter', 400);
+        parent::__construct('bad parameter');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemEventsInternalServerErrorException.php b/src/Exception/SystemEventsInternalServerErrorException.php
index 9ea6bb0..8502eb6 100644
--- a/src/Exception/SystemEventsInternalServerErrorException.php
+++ b/src/Exception/SystemEventsInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemEventsInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemEventsInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemInfoInternalServerErrorException.php b/src/Exception/SystemInfoInternalServerErrorException.php
index addabdc..ca15da9 100644
--- a/src/Exception/SystemInfoInternalServerErrorException.php
+++ b/src/Exception/SystemInfoInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemInfoInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemInfoInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemPingHeadInternalServerErrorException.php b/src/Exception/SystemPingHeadInternalServerErrorException.php
index 17fa8ea..450f2cf 100644
--- a/src/Exception/SystemPingHeadInternalServerErrorException.php
+++ b/src/Exception/SystemPingHeadInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemPingHeadInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemPingHeadInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemPingInternalServerErrorException.php b/src/Exception/SystemPingInternalServerErrorException.php
index e7e91d4..0193b6a 100644
--- a/src/Exception/SystemPingInternalServerErrorException.php
+++ b/src/Exception/SystemPingInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemPingInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemPingInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/SystemVersionInternalServerErrorException.php b/src/Exception/SystemVersionInternalServerErrorException.php
index 0e85872..bb497a3 100644
--- a/src/Exception/SystemVersionInternalServerErrorException.php
+++ b/src/Exception/SystemVersionInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class SystemVersionInternalServerErrorException extends \RuntimeException implements ServerException
+class SystemVersionInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskInspectInternalServerErrorException.php b/src/Exception/TaskInspectInternalServerErrorException.php
index 0487ef8..ee27f6a 100644
--- a/src/Exception/TaskInspectInternalServerErrorException.php
+++ b/src/Exception/TaskInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class TaskInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskInspectNotFoundException.php b/src/Exception/TaskInspectNotFoundException.php
index 82a8362..ec6fd4e 100644
--- a/src/Exception/TaskInspectNotFoundException.php
+++ b/src/Exception/TaskInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskInspectNotFoundException extends \RuntimeException implements ClientException
+class TaskInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such task', 404);
+        parent::__construct('no such task');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskInspectServiceUnavailableException.php b/src/Exception/TaskInspectServiceUnavailableException.php
index 578fcb1..acbe3b1 100644
--- a/src/Exception/TaskInspectServiceUnavailableException.php
+++ b/src/Exception/TaskInspectServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskInspectServiceUnavailableException extends \RuntimeException implements ServerException
+class TaskInspectServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskListInternalServerErrorException.php b/src/Exception/TaskListInternalServerErrorException.php
index 68bbf5a..543014f 100644
--- a/src/Exception/TaskListInternalServerErrorException.php
+++ b/src/Exception/TaskListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskListInternalServerErrorException extends \RuntimeException implements ServerException
+class TaskListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskListServiceUnavailableException.php b/src/Exception/TaskListServiceUnavailableException.php
index a20f087..dc03082 100644
--- a/src/Exception/TaskListServiceUnavailableException.php
+++ b/src/Exception/TaskListServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskListServiceUnavailableException extends \RuntimeException implements ServerException
+class TaskListServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskLogsInternalServerErrorException.php b/src/Exception/TaskLogsInternalServerErrorException.php
index af05da4..438c21d 100644
--- a/src/Exception/TaskLogsInternalServerErrorException.php
+++ b/src/Exception/TaskLogsInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskLogsInternalServerErrorException extends \RuntimeException implements ServerException
+class TaskLogsInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('server error', 500);
+        parent::__construct('server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskLogsNotFoundException.php b/src/Exception/TaskLogsNotFoundException.php
index cbf3ee8..cd2202d 100644
--- a/src/Exception/TaskLogsNotFoundException.php
+++ b/src/Exception/TaskLogsNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskLogsNotFoundException extends \RuntimeException implements ClientException
+class TaskLogsNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('no such task', 404);
+        parent::__construct('no such task');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/TaskLogsServiceUnavailableException.php b/src/Exception/TaskLogsServiceUnavailableException.php
index 19854ec..ef18bbc 100644
--- a/src/Exception/TaskLogsServiceUnavailableException.php
+++ b/src/Exception/TaskLogsServiceUnavailableException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class TaskLogsServiceUnavailableException extends \RuntimeException implements ServerException
+class TaskLogsServiceUnavailableException extends ServiceUnavailableException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('node is not part of a swarm', 503);
+        parent::__construct('node is not part of a swarm');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/UnauthorizedException.php b/src/Exception/UnauthorizedException.php
new file mode 100644
index 0000000..9b42d0c
--- /dev/null
+++ b/src/Exception/UnauthorizedException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Docker\Api\Exception;
+
+class UnauthorizedException extends \RuntimeException implements ClientException
+{
+    public function __construct(string $message)
+    {
+        parent::__construct($message, 401);
+    }
+}
\ No newline at end of file
diff --git a/src/Exception/VolumeCreateInternalServerErrorException.php b/src/Exception/VolumeCreateInternalServerErrorException.php
index 48fd55d..8c29687 100644
--- a/src/Exception/VolumeCreateInternalServerErrorException.php
+++ b/src/Exception/VolumeCreateInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeCreateInternalServerErrorException extends \RuntimeException implements ServerException
+class VolumeCreateInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumeDeleteConflictException.php b/src/Exception/VolumeDeleteConflictException.php
index 875beb4..04c8f02 100644
--- a/src/Exception/VolumeDeleteConflictException.php
+++ b/src/Exception/VolumeDeleteConflictException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeDeleteConflictException extends \RuntimeException implements ClientException
+class VolumeDeleteConflictException extends ConflictException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Volume is in use and cannot be removed', 409);
+        parent::__construct('Volume is in use and cannot be removed');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumeDeleteInternalServerErrorException.php b/src/Exception/VolumeDeleteInternalServerErrorException.php
index 40c489e..94124a5 100644
--- a/src/Exception/VolumeDeleteInternalServerErrorException.php
+++ b/src/Exception/VolumeDeleteInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeDeleteInternalServerErrorException extends \RuntimeException implements ServerException
+class VolumeDeleteInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumeDeleteNotFoundException.php b/src/Exception/VolumeDeleteNotFoundException.php
index 204e28d..11ac52a 100644
--- a/src/Exception/VolumeDeleteNotFoundException.php
+++ b/src/Exception/VolumeDeleteNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeDeleteNotFoundException extends \RuntimeException implements ClientException
+class VolumeDeleteNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such volume or volume driver', 404);
+        parent::__construct('No such volume or volume driver');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumeInspectInternalServerErrorException.php b/src/Exception/VolumeInspectInternalServerErrorException.php
index 09a3c75..3372167 100644
--- a/src/Exception/VolumeInspectInternalServerErrorException.php
+++ b/src/Exception/VolumeInspectInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeInspectInternalServerErrorException extends \RuntimeException implements ServerException
+class VolumeInspectInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumeInspectNotFoundException.php b/src/Exception/VolumeInspectNotFoundException.php
index f24a5cd..ae2bdb8 100644
--- a/src/Exception/VolumeInspectNotFoundException.php
+++ b/src/Exception/VolumeInspectNotFoundException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeInspectNotFoundException extends \RuntimeException implements ClientException
+class VolumeInspectNotFoundException extends NotFoundException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('No such volume', 404);
+        parent::__construct('No such volume');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumeListInternalServerErrorException.php b/src/Exception/VolumeListInternalServerErrorException.php
index 2f0900d..05ba8f9 100644
--- a/src/Exception/VolumeListInternalServerErrorException.php
+++ b/src/Exception/VolumeListInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumeListInternalServerErrorException extends \RuntimeException implements ServerException
+class VolumeListInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Exception/VolumePruneInternalServerErrorException.php b/src/Exception/VolumePruneInternalServerErrorException.php
index b04613e..200be8f 100644
--- a/src/Exception/VolumePruneInternalServerErrorException.php
+++ b/src/Exception/VolumePruneInternalServerErrorException.php
@@ -2,15 +2,18 @@
 
 namespace Docker\Api\Exception;
 
-class VolumePruneInternalServerErrorException extends \RuntimeException implements ServerException
+class VolumePruneInternalServerErrorException extends InternalServerErrorException
 {
+    /**
+     * @var \Docker\Api\Model\ErrorResponse
+     */
     private $errorResponse;
     public function __construct(\Docker\Api\Model\ErrorResponse $errorResponse)
     {
-        parent::__construct('Server error', 500);
+        parent::__construct('Server error');
         $this->errorResponse = $errorResponse;
     }
-    public function getErrorResponse()
+    public function getErrorResponse() : \Docker\Api\Model\ErrorResponse
     {
         return $this->errorResponse;
     }
diff --git a/src/Normalizer/AddressNormalizer.php b/src/Normalizer/AddressNormalizer.php
index 8f99a60..e09fa94 100644
--- a/src/Normalizer/AddressNormalizer.php
+++ b/src/Normalizer/AddressNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class AddressNormalizer implements DenormalizerInterface, NormalizerInterface, D
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Address';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Address';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Address();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Addr', $data) && $data['Addr'] !== null) {
             $object->setAddr($data['Addr']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/AuthConfigNormalizer.php b/src/Normalizer/AuthConfigNormalizer.php
index a076054..b03bdce 100644
--- a/src/Normalizer/AuthConfigNormalizer.php
+++ b/src/Normalizer/AuthConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class AuthConfigNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\AuthConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\AuthConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\AuthConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('username', $data) && $data['username'] !== null) {
             $object->setUsername($data['username']);
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/AuthPostResponse200Normalizer.php b/src/Normalizer/AuthPostResponse200Normalizer.php
index cc1c029..2aa2185 100644
--- a/src/Normalizer/AuthPostResponse200Normalizer.php
+++ b/src/Normalizer/AuthPostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class AuthPostResponse200Normalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\AuthPostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\AuthPostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\AuthPostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Status', $data) && $data['Status'] !== null) {
             $object->setStatus($data['Status']);
         }
@@ -47,12 +56,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getStatus()) {
-            $data['Status'] = $object->getStatus();
-        }
+        $data['Status'] = $object->getStatus();
         if (null !== $object->getIdentityToken()) {
             $data['IdentityToken'] = $object->getIdentityToken();
         }
diff --git a/src/Normalizer/BuildCacheNormalizer.php b/src/Normalizer/BuildCacheNormalizer.php
index 6697341..e02504a 100644
--- a/src/Normalizer/BuildCacheNormalizer.php
+++ b/src/Normalizer/BuildCacheNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class BuildCacheNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\BuildCache';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\BuildCache';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\BuildCache();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -95,6 +104,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/BuildInfoNormalizer.php b/src/Normalizer/BuildInfoNormalizer.php
index e9b6aa5..b805843 100644
--- a/src/Normalizer/BuildInfoNormalizer.php
+++ b/src/Normalizer/BuildInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class BuildInfoNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\BuildInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\BuildInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\BuildInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('id', $data) && $data['id'] !== null) {
             $object->setId($data['id']);
         }
@@ -83,6 +92,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/BuildPrunePostResponse200Normalizer.php b/src/Normalizer/BuildPrunePostResponse200Normalizer.php
index bba6a8a..2b15d74 100644
--- a/src/Normalizer/BuildPrunePostResponse200Normalizer.php
+++ b/src/Normalizer/BuildPrunePostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class BuildPrunePostResponse200Normalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\BuildPrunePostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\BuildPrunePostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\BuildPrunePostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('CachesDeleted', $data) && $data['CachesDeleted'] !== null) {
             $values = array();
             foreach ($data['CachesDeleted'] as $value) {
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ClusterInfoNormalizer.php b/src/Normalizer/ClusterInfoNormalizer.php
index f81378b..808a063 100644
--- a/src/Normalizer/ClusterInfoNormalizer.php
+++ b/src/Normalizer/ClusterInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ClusterInfoNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ClusterInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ClusterInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ClusterInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -99,6 +108,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/CommitNormalizer.php b/src/Normalizer/CommitNormalizer.php
index 97752d9..e2a2483 100644
--- a/src/Normalizer/CommitNormalizer.php
+++ b/src/Normalizer/CommitNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class CommitNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Commit';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Commit';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Commit();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ConfigNormalizer.php b/src/Normalizer/ConfigNormalizer.php
index a516d4f..601db37 100644
--- a/src/Normalizer/ConfigNormalizer.php
+++ b/src/Normalizer/ConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ConfigNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Config';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Config';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Config();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ConfigSpecNormalizer.php b/src/Normalizer/ConfigSpecNormalizer.php
index 10c7887..784af18 100644
--- a/src/Normalizer/ConfigSpecNormalizer.php
+++ b/src/Normalizer/ConfigSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ConfigSpecNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ConfigSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ConfigSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ConfigSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ConfigsCreatePostBodyNormalizer.php b/src/Normalizer/ConfigsCreatePostBodyNormalizer.php
index 3d1e1ff..fc057bc 100644
--- a/src/Normalizer/ConfigsCreatePostBodyNormalizer.php
+++ b/src/Normalizer/ConfigsCreatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ConfigsCreatePostBodyNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ConfigsCreatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ConfigsCreatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ConfigsCreatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainerConfigNormalizer.php b/src/Normalizer/ContainerConfigNormalizer.php
index b3f20fd..3645b1d 100644
--- a/src/Normalizer/ContainerConfigNormalizer.php
+++ b/src/Normalizer/ContainerConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainerConfigNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainerConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainerConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainerConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Hostname', $data) && $data['Hostname'] !== null) {
             $object->setHostname($data['Hostname']);
         }
@@ -217,6 +226,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainerStateNormalizer.php b/src/Normalizer/ContainerStateNormalizer.php
index a01e7fe..99fac0a 100644
--- a/src/Normalizer/ContainerStateNormalizer.php
+++ b/src/Normalizer/ContainerStateNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainerStateNormalizer implements DenormalizerInterface, NormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainerState';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainerState';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainerState();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Status', $data) && $data['Status'] !== null) {
             $object->setStatus($data['Status']);
         }
@@ -107,6 +116,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainerSummaryItemHostConfigNormalizer.php b/src/Normalizer/ContainerSummaryItemHostConfigNormalizer.php
index fcd147e..af5064d 100644
--- a/src/Normalizer/ContainerSummaryItemHostConfigNormalizer.php
+++ b/src/Normalizer/ContainerSummaryItemHostConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainerSummaryItemHostConfigNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainerSummaryItemHostConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainerSummaryItemHostConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainerSummaryItemHostConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NetworkMode', $data) && $data['NetworkMode'] !== null) {
             $object->setNetworkMode($data['NetworkMode']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainerSummaryItemNetworkSettingsNormalizer.php b/src/Normalizer/ContainerSummaryItemNetworkSettingsNormalizer.php
index 15e0404..0c8983b 100644
--- a/src/Normalizer/ContainerSummaryItemNetworkSettingsNormalizer.php
+++ b/src/Normalizer/ContainerSummaryItemNetworkSettingsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainerSummaryItemNetworkSettingsNormalizer implements DenormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainerSummaryItemNetworkSettings';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainerSummaryItemNetworkSettings';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainerSummaryItemNetworkSettings();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Networks', $data) && $data['Networks'] !== null) {
             $values = new \ArrayObject(array(), \ArrayObject::ARRAY_AS_PROPS);
             foreach ($data['Networks'] as $key => $value) {
@@ -45,6 +54,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainerSummaryItemNormalizer.php b/src/Normalizer/ContainerSummaryItemNormalizer.php
index 4cb747f..827eb3f 100644
--- a/src/Normalizer/ContainerSummaryItemNormalizer.php
+++ b/src/Normalizer/ContainerSummaryItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainerSummaryItemNormalizer implements DenormalizerInterface, Normalize
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainerSummaryItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainerSummaryItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainerSummaryItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -141,6 +150,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersCreatePostBodyNormalizer.php b/src/Normalizer/ContainersCreatePostBodyNormalizer.php
index 363a4da..a802964 100644
--- a/src/Normalizer/ContainersCreatePostBodyNormalizer.php
+++ b/src/Normalizer/ContainersCreatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersCreatePostBodyNormalizer implements DenormalizerInterface, Norma
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersCreatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersCreatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersCreatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Hostname', $data) && $data['Hostname'] !== null) {
             $object->setHostname($data['Hostname']);
         }
@@ -229,6 +238,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersCreatePostResponse201Normalizer.php b/src/Normalizer/ContainersCreatePostResponse201Normalizer.php
index 1eb4e70..a96c613 100644
--- a/src/Normalizer/ContainersCreatePostResponse201Normalizer.php
+++ b/src/Normalizer/ContainersCreatePostResponse201Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersCreatePostResponse201Normalizer implements DenormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersCreatePostResponse201';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersCreatePostResponse201';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersCreatePostResponse201();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -51,19 +60,18 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getId()) {
-            $data['Id'] = $object->getId();
-        }
-        if (null !== $object->getWarnings()) {
-            $values = array();
-            foreach ($object->getWarnings() as $value) {
-                $values[] = $value;
-            }
-            $data['Warnings'] = $values;
+        $data['Id'] = $object->getId();
+        $values = array();
+        foreach ($object->getWarnings() as $value) {
+            $values[] = $value;
         }
+        $data['Warnings'] = $values;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/ContainersIdArchiveGetResponse400Normalizer.php b/src/Normalizer/ContainersIdArchiveGetResponse400Normalizer.php
index f3a615f..917ed72 100644
--- a/src/Normalizer/ContainersIdArchiveGetResponse400Normalizer.php
+++ b/src/Normalizer/ContainersIdArchiveGetResponse400Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdArchiveGetResponse400Normalizer implements DenormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdArchiveGetResponse400';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdArchiveGetResponse400';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdArchiveGetResponse400();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('message', $data) && $data['message'] !== null) {
             $object->setMessage($data['message']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdArchiveHeadResponse400Normalizer.php b/src/Normalizer/ContainersIdArchiveHeadResponse400Normalizer.php
index 95907f6..358519e 100644
--- a/src/Normalizer/ContainersIdArchiveHeadResponse400Normalizer.php
+++ b/src/Normalizer/ContainersIdArchiveHeadResponse400Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdArchiveHeadResponse400Normalizer implements DenormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdArchiveHeadResponse400';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdArchiveHeadResponse400';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdArchiveHeadResponse400();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('message', $data) && $data['message'] !== null) {
             $object->setMessage($data['message']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdChangesGetResponse200ItemNormalizer.php b/src/Normalizer/ContainersIdChangesGetResponse200ItemNormalizer.php
index be60851..4d8a8a9 100644
--- a/src/Normalizer/ContainersIdChangesGetResponse200ItemNormalizer.php
+++ b/src/Normalizer/ContainersIdChangesGetResponse200ItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdChangesGetResponse200ItemNormalizer implements DenormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdChangesGetResponse200Item';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdChangesGetResponse200Item';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdChangesGetResponse200Item();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Path', $data) && $data['Path'] !== null) {
             $object->setPath($data['Path']);
         }
@@ -47,15 +56,14 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getPath()) {
-            $data['Path'] = $object->getPath();
-        }
-        if (null !== $object->getKind()) {
-            $data['Kind'] = $object->getKind();
-        }
+        $data['Path'] = $object->getPath();
+        $data['Kind'] = $object->getKind();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/ContainersIdExecPostBodyNormalizer.php b/src/Normalizer/ContainersIdExecPostBodyNormalizer.php
index f72186f..715e8f0 100644
--- a/src/Normalizer/ContainersIdExecPostBodyNormalizer.php
+++ b/src/Normalizer/ContainersIdExecPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdExecPostBodyNormalizer implements DenormalizerInterface, Norma
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdExecPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdExecPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdExecPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('AttachStdin', $data) && $data['AttachStdin'] !== null) {
             $object->setAttachStdin($data['AttachStdin']);
         }
@@ -103,6 +112,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdJsonGetResponse200Normalizer.php b/src/Normalizer/ContainersIdJsonGetResponse200Normalizer.php
index b92ee4c..68c6da6 100644
--- a/src/Normalizer/ContainersIdJsonGetResponse200Normalizer.php
+++ b/src/Normalizer/ContainersIdJsonGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdJsonGetResponse200Normalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdJsonGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdJsonGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdJsonGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -203,6 +212,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdTopGetResponse200Normalizer.php b/src/Normalizer/ContainersIdTopGetResponse200Normalizer.php
index e6e5e27..483ef00 100644
--- a/src/Normalizer/ContainersIdTopGetResponse200Normalizer.php
+++ b/src/Normalizer/ContainersIdTopGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdTopGetResponse200Normalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdTopGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdTopGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdTopGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Titles', $data) && $data['Titles'] !== null) {
             $values = array();
             foreach ($data['Titles'] as $value) {
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdUpdatePostBodyNormalizer.php b/src/Normalizer/ContainersIdUpdatePostBodyNormalizer.php
index d1f97f2..a534c80 100644
--- a/src/Normalizer/ContainersIdUpdatePostBodyNormalizer.php
+++ b/src/Normalizer/ContainersIdUpdatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdUpdatePostBodyNormalizer implements DenormalizerInterface, Nor
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdUpdatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdUpdatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdUpdatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('CpuShares', $data) && $data['CpuShares'] !== null) {
             $object->setCpuShares($data['CpuShares']);
         }
@@ -269,6 +278,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdUpdatePostResponse200Normalizer.php b/src/Normalizer/ContainersIdUpdatePostResponse200Normalizer.php
index 43e2f2f..33f0403 100644
--- a/src/Normalizer/ContainersIdUpdatePostResponse200Normalizer.php
+++ b/src/Normalizer/ContainersIdUpdatePostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdUpdatePostResponse200Normalizer implements DenormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdUpdatePostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdUpdatePostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdUpdatePostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Warnings', $data) && $data['Warnings'] !== null) {
             $values = array();
             foreach ($data['Warnings'] as $value) {
@@ -45,6 +54,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdWaitPostResponse200ErrorNormalizer.php b/src/Normalizer/ContainersIdWaitPostResponse200ErrorNormalizer.php
index 8eb0194..04a1e84 100644
--- a/src/Normalizer/ContainersIdWaitPostResponse200ErrorNormalizer.php
+++ b/src/Normalizer/ContainersIdWaitPostResponse200ErrorNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdWaitPostResponse200ErrorNormalizer implements DenormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200Error';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200Error';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdWaitPostResponse200Error();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Message', $data) && $data['Message'] !== null) {
             $object->setMessage($data['Message']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ContainersIdWaitPostResponse200Normalizer.php b/src/Normalizer/ContainersIdWaitPostResponse200Normalizer.php
index 79180dd..b470779 100644
--- a/src/Normalizer/ContainersIdWaitPostResponse200Normalizer.php
+++ b/src/Normalizer/ContainersIdWaitPostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersIdWaitPostResponse200Normalizer implements DenormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersIdWaitPostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('StatusCode', $data) && $data['StatusCode'] !== null) {
             $object->setStatusCode($data['StatusCode']);
         }
@@ -47,12 +56,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getStatusCode()) {
-            $data['StatusCode'] = $object->getStatusCode();
-        }
+        $data['StatusCode'] = $object->getStatusCode();
         if (null !== $object->getError()) {
             $data['Error'] = $this->normalizer->normalize($object->getError(), 'json', $context);
         }
diff --git a/src/Normalizer/ContainersPrunePostResponse200Normalizer.php b/src/Normalizer/ContainersPrunePostResponse200Normalizer.php
index 1c658af..46efad9 100644
--- a/src/Normalizer/ContainersPrunePostResponse200Normalizer.php
+++ b/src/Normalizer/ContainersPrunePostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ContainersPrunePostResponse200Normalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ContainersPrunePostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ContainersPrunePostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ContainersPrunePostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ContainersDeleted', $data) && $data['ContainersDeleted'] !== null) {
             $values = array();
             foreach ($data['ContainersDeleted'] as $value) {
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/CreateImageInfoNormalizer.php b/src/Normalizer/CreateImageInfoNormalizer.php
index 4c260d9..6570cee 100644
--- a/src/Normalizer/CreateImageInfoNormalizer.php
+++ b/src/Normalizer/CreateImageInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class CreateImageInfoNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\CreateImageInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\CreateImageInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\CreateImageInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('id', $data) && $data['id'] !== null) {
             $object->setId($data['id']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/DeviceMappingNormalizer.php b/src/Normalizer/DeviceMappingNormalizer.php
index 843ca1f..5b39da6 100644
--- a/src/Normalizer/DeviceMappingNormalizer.php
+++ b/src/Normalizer/DeviceMappingNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class DeviceMappingNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\DeviceMapping';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\DeviceMapping';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\DeviceMapping();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('PathOnHost', $data) && $data['PathOnHost'] !== null) {
             $object->setPathOnHost($data['PathOnHost']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/DeviceRequestNormalizer.php b/src/Normalizer/DeviceRequestNormalizer.php
index d7a8415..c100132 100644
--- a/src/Normalizer/DeviceRequestNormalizer.php
+++ b/src/Normalizer/DeviceRequestNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class DeviceRequestNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\DeviceRequest';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\DeviceRequest';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\DeviceRequest();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Driver', $data) && $data['Driver'] !== null) {
             $object->setDriver($data['Driver']);
         }
@@ -81,6 +90,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/DistributionNameJsonGetResponse200DescriptorNormalizer.php b/src/Normalizer/DistributionNameJsonGetResponse200DescriptorNormalizer.php
index b7356ef..7c43e1d 100644
--- a/src/Normalizer/DistributionNameJsonGetResponse200DescriptorNormalizer.php
+++ b/src/Normalizer/DistributionNameJsonGetResponse200DescriptorNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class DistributionNameJsonGetResponse200DescriptorNormalizer implements Denormal
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200Descriptor';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200Descriptor';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\DistributionNameJsonGetResponse200Descriptor();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('MediaType', $data) && $data['MediaType'] !== null) {
             $object->setMediaType($data['MediaType']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/DistributionNameJsonGetResponse200Normalizer.php b/src/Normalizer/DistributionNameJsonGetResponse200Normalizer.php
index 22a12b4..38d566a 100644
--- a/src/Normalizer/DistributionNameJsonGetResponse200Normalizer.php
+++ b/src/Normalizer/DistributionNameJsonGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class DistributionNameJsonGetResponse200Normalizer implements DenormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\DistributionNameJsonGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Descriptor', $data) && $data['Descriptor'] !== null) {
             $object->setDescriptor($this->denormalizer->denormalize($data['Descriptor'], 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200Descriptor', 'json', $context));
         }
@@ -51,19 +60,18 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getDescriptor()) {
-            $data['Descriptor'] = $this->normalizer->normalize($object->getDescriptor(), 'json', $context);
-        }
-        if (null !== $object->getPlatforms()) {
-            $values = array();
-            foreach ($object->getPlatforms() as $value) {
-                $values[] = $this->normalizer->normalize($value, 'json', $context);
-            }
-            $data['Platforms'] = $values;
+        $data['Descriptor'] = $this->normalizer->normalize($object->getDescriptor(), 'json', $context);
+        $values = array();
+        foreach ($object->getPlatforms() as $value) {
+            $values[] = $this->normalizer->normalize($value, 'json', $context);
         }
+        $data['Platforms'] = $values;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/DistributionNameJsonGetResponse200PlatformsItemNormalizer.php b/src/Normalizer/DistributionNameJsonGetResponse200PlatformsItemNormalizer.php
index 3e14c23..422add8 100644
--- a/src/Normalizer/DistributionNameJsonGetResponse200PlatformsItemNormalizer.php
+++ b/src/Normalizer/DistributionNameJsonGetResponse200PlatformsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class DistributionNameJsonGetResponse200PlatformsItemNormalizer implements Denor
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200PlatformsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200PlatformsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\DistributionNameJsonGetResponse200PlatformsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Architecture', $data) && $data['Architecture'] !== null) {
             $object->setArchitecture($data['Architecture']);
         }
@@ -79,6 +88,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/DriverNormalizer.php b/src/Normalizer/DriverNormalizer.php
index 1c64707..02d6b75 100644
--- a/src/Normalizer/DriverNormalizer.php
+++ b/src/Normalizer/DriverNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class DriverNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Driver';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Driver';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Driver();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -51,12 +60,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
+        $data['Name'] = $object->getName();
         if (null !== $object->getOptions()) {
             $values = array();
             foreach ($object->getOptions() as $key => $value) {
diff --git a/src/Normalizer/EndpointIPAMConfigNormalizer.php b/src/Normalizer/EndpointIPAMConfigNormalizer.php
index d50d1f6..125e18d 100644
--- a/src/Normalizer/EndpointIPAMConfigNormalizer.php
+++ b/src/Normalizer/EndpointIPAMConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EndpointIPAMConfigNormalizer implements DenormalizerInterface, NormalizerI
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EndpointIPAMConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EndpointIPAMConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EndpointIPAMConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('IPv4Address', $data) && $data['IPv4Address'] !== null) {
             $object->setIPv4Address($data['IPv4Address']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/EndpointPortConfigNormalizer.php b/src/Normalizer/EndpointPortConfigNormalizer.php
index bdf9818..78d22d5 100644
--- a/src/Normalizer/EndpointPortConfigNormalizer.php
+++ b/src/Normalizer/EndpointPortConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EndpointPortConfigNormalizer implements DenormalizerInterface, NormalizerI
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EndpointPortConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EndpointPortConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EndpointPortConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/EndpointSettingsNormalizer.php b/src/Normalizer/EndpointSettingsNormalizer.php
index 617a369..f57be25 100644
--- a/src/Normalizer/EndpointSettingsNormalizer.php
+++ b/src/Normalizer/EndpointSettingsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EndpointSettingsNormalizer implements DenormalizerInterface, NormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EndpointSettings';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EndpointSettings';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EndpointSettings();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('IPAMConfig', $data) && $data['IPAMConfig'] !== null) {
             $object->setIPAMConfig($this->denormalizer->denormalize($data['IPAMConfig'], 'Docker\\Api\\Model\\EndpointIPAMConfig', 'json', $context));
         }
@@ -125,6 +134,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/EndpointSpecNormalizer.php b/src/Normalizer/EndpointSpecNormalizer.php
index 0ed3bf0..64868ae 100644
--- a/src/Normalizer/EndpointSpecNormalizer.php
+++ b/src/Normalizer/EndpointSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EndpointSpecNormalizer implements DenormalizerInterface, NormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EndpointSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EndpointSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EndpointSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Mode', $data) && $data['Mode'] !== null) {
             $object->setMode($data['Mode']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/EngineDescriptionNormalizer.php b/src/Normalizer/EngineDescriptionNormalizer.php
index de5ba78..eb8c004 100644
--- a/src/Normalizer/EngineDescriptionNormalizer.php
+++ b/src/Normalizer/EngineDescriptionNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EngineDescriptionNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EngineDescription';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EngineDescription';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EngineDescription();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('EngineVersion', $data) && $data['EngineVersion'] !== null) {
             $object->setEngineVersion($data['EngineVersion']);
         }
@@ -61,6 +70,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/EngineDescriptionPluginsItemNormalizer.php b/src/Normalizer/EngineDescriptionPluginsItemNormalizer.php
index d0a364d..c4b9dce 100644
--- a/src/Normalizer/EngineDescriptionPluginsItemNormalizer.php
+++ b/src/Normalizer/EngineDescriptionPluginsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EngineDescriptionPluginsItemNormalizer implements DenormalizerInterface, N
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EngineDescriptionPluginsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EngineDescriptionPluginsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EngineDescriptionPluginsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Type', $data) && $data['Type'] !== null) {
             $object->setType($data['Type']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ErrorDetailNormalizer.php b/src/Normalizer/ErrorDetailNormalizer.php
index c33f336..2c39be0 100644
--- a/src/Normalizer/ErrorDetailNormalizer.php
+++ b/src/Normalizer/ErrorDetailNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ErrorDetailNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ErrorDetail';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ErrorDetail';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ErrorDetail();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('code', $data) && $data['code'] !== null) {
             $object->setCode($data['code']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ErrorResponseNormalizer.php b/src/Normalizer/ErrorResponseNormalizer.php
index 78d4613..51803f5 100644
--- a/src/Normalizer/ErrorResponseNormalizer.php
+++ b/src/Normalizer/ErrorResponseNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ErrorResponseNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ErrorResponse';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ErrorResponse';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ErrorResponse();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('message', $data) && $data['message'] !== null) {
             $object->setMessage($data['message']);
         }
@@ -41,12 +50,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getMessage()) {
-            $data['message'] = $object->getMessage();
-        }
+        $data['message'] = $object->getMessage();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/EventsGetResponse200ActorNormalizer.php b/src/Normalizer/EventsGetResponse200ActorNormalizer.php
index f41b5da..c95077b 100644
--- a/src/Normalizer/EventsGetResponse200ActorNormalizer.php
+++ b/src/Normalizer/EventsGetResponse200ActorNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EventsGetResponse200ActorNormalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EventsGetResponse200Actor';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EventsGetResponse200Actor';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EventsGetResponse200Actor();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/EventsGetResponse200Normalizer.php b/src/Normalizer/EventsGetResponse200Normalizer.php
index 688008a..8e467b5 100644
--- a/src/Normalizer/EventsGetResponse200Normalizer.php
+++ b/src/Normalizer/EventsGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class EventsGetResponse200Normalizer implements DenormalizerInterface, Normalize
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\EventsGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\EventsGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\EventsGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Type', $data) && $data['Type'] !== null) {
             $object->setType($data['Type']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ExecIdJsonGetResponse200Normalizer.php b/src/Normalizer/ExecIdJsonGetResponse200Normalizer.php
index e00dc7a..01a2ea9 100644
--- a/src/Normalizer/ExecIdJsonGetResponse200Normalizer.php
+++ b/src/Normalizer/ExecIdJsonGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ExecIdJsonGetResponse200Normalizer implements DenormalizerInterface, Norma
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ExecIdJsonGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ExecIdJsonGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ExecIdJsonGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('CanRemove', $data) && $data['CanRemove'] !== null) {
             $object->setCanRemove($data['CanRemove']);
         }
@@ -101,6 +110,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ExecIdStartPostBodyNormalizer.php b/src/Normalizer/ExecIdStartPostBodyNormalizer.php
index 03c498b..0db3463 100644
--- a/src/Normalizer/ExecIdStartPostBodyNormalizer.php
+++ b/src/Normalizer/ExecIdStartPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ExecIdStartPostBodyNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ExecIdStartPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ExecIdStartPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ExecIdStartPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Detach', $data) && $data['Detach'] !== null) {
             $object->setDetach($data['Detach']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/GenericResourcesItemDiscreteResourceSpecNormalizer.php b/src/Normalizer/GenericResourcesItemDiscreteResourceSpecNormalizer.php
index b3fcedf..ef0da20 100644
--- a/src/Normalizer/GenericResourcesItemDiscreteResourceSpecNormalizer.php
+++ b/src/Normalizer/GenericResourcesItemDiscreteResourceSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class GenericResourcesItemDiscreteResourceSpecNormalizer implements Denormalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\GenericResourcesItemDiscreteResourceSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\GenericResourcesItemDiscreteResourceSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\GenericResourcesItemDiscreteResourceSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Kind', $data) && $data['Kind'] !== null) {
             $object->setKind($data['Kind']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/GenericResourcesItemNamedResourceSpecNormalizer.php b/src/Normalizer/GenericResourcesItemNamedResourceSpecNormalizer.php
index 41c8833..90c56cc 100644
--- a/src/Normalizer/GenericResourcesItemNamedResourceSpecNormalizer.php
+++ b/src/Normalizer/GenericResourcesItemNamedResourceSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class GenericResourcesItemNamedResourceSpecNormalizer implements DenormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\GenericResourcesItemNamedResourceSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\GenericResourcesItemNamedResourceSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\GenericResourcesItemNamedResourceSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Kind', $data) && $data['Kind'] !== null) {
             $object->setKind($data['Kind']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/GenericResourcesItemNormalizer.php b/src/Normalizer/GenericResourcesItemNormalizer.php
index 35fbc70..5dff3d0 100644
--- a/src/Normalizer/GenericResourcesItemNormalizer.php
+++ b/src/Normalizer/GenericResourcesItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class GenericResourcesItemNormalizer implements DenormalizerInterface, Normalize
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\GenericResourcesItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\GenericResourcesItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\GenericResourcesItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NamedResourceSpec', $data) && $data['NamedResourceSpec'] !== null) {
             $object->setNamedResourceSpec($this->denormalizer->denormalize($data['NamedResourceSpec'], 'Docker\\Api\\Model\\GenericResourcesItemNamedResourceSpec', 'json', $context));
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/GraphDriverDataNormalizer.php b/src/Normalizer/GraphDriverDataNormalizer.php
index c6622fd..82041b9 100644
--- a/src/Normalizer/GraphDriverDataNormalizer.php
+++ b/src/Normalizer/GraphDriverDataNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class GraphDriverDataNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\GraphDriverData';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\GraphDriverData';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\GraphDriverData();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -51,19 +60,18 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getData()) {
-            $values = array();
-            foreach ($object->getData() as $key => $value) {
-                $values[$key] = $value;
-            }
-            $data['Data'] = $values;
+        $data['Name'] = $object->getName();
+        $values = array();
+        foreach ($object->getData() as $key => $value) {
+            $values[$key] = $value;
         }
+        $data['Data'] = $values;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/HealthConfigNormalizer.php b/src/Normalizer/HealthConfigNormalizer.php
index c6ef319..7e8ee71 100644
--- a/src/Normalizer/HealthConfigNormalizer.php
+++ b/src/Normalizer/HealthConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class HealthConfigNormalizer implements DenormalizerInterface, NormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\HealthConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\HealthConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\HealthConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Test', $data) && $data['Test'] !== null) {
             $values = array();
             foreach ($data['Test'] as $value) {
@@ -69,6 +78,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/HealthNormalizer.php b/src/Normalizer/HealthNormalizer.php
index 8efbeb9..ed53473 100644
--- a/src/Normalizer/HealthNormalizer.php
+++ b/src/Normalizer/HealthNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class HealthNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Health';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Health';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Health();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Status', $data) && $data['Status'] !== null) {
             $object->setStatus($data['Status']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/HealthcheckResultNormalizer.php b/src/Normalizer/HealthcheckResultNormalizer.php
index 255f26f..aad659d 100644
--- a/src/Normalizer/HealthcheckResultNormalizer.php
+++ b/src/Normalizer/HealthcheckResultNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class HealthcheckResultNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\HealthcheckResult';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\HealthcheckResult';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\HealthcheckResult();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Start', $data) && $data['Start'] !== null) {
             $object->setStart(\DateTime::createFromFormat('Y-m-d\\TH:i:sP', $data['Start']));
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/HostConfigLogConfigNormalizer.php b/src/Normalizer/HostConfigLogConfigNormalizer.php
index 2dfaa90..f301db8 100644
--- a/src/Normalizer/HostConfigLogConfigNormalizer.php
+++ b/src/Normalizer/HostConfigLogConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class HostConfigLogConfigNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\HostConfigLogConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\HostConfigLogConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\HostConfigLogConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Type', $data) && $data['Type'] !== null) {
             $object->setType($data['Type']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/HostConfigNormalizer.php b/src/Normalizer/HostConfigNormalizer.php
index d39ff8a..5554a5d 100644
--- a/src/Normalizer/HostConfigNormalizer.php
+++ b/src/Normalizer/HostConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class HostConfigNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\HostConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\HostConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\HostConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('CpuShares', $data) && $data['CpuShares'] !== null) {
             $object->setCpuShares($data['CpuShares']);
         }
@@ -575,6 +584,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/IPAMNormalizer.php b/src/Normalizer/IPAMNormalizer.php
index 873d98f..417f846 100644
--- a/src/Normalizer/IPAMNormalizer.php
+++ b/src/Normalizer/IPAMNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class IPAMNormalizer implements DenormalizerInterface, NormalizerInterface, Deno
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\IPAM';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\IPAM';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\IPAM();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Driver', $data) && $data['Driver'] !== null) {
             $object->setDriver($data['Driver']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/IdResponseNormalizer.php b/src/Normalizer/IdResponseNormalizer.php
index c4251c6..8a7bf0c 100644
--- a/src/Normalizer/IdResponseNormalizer.php
+++ b/src/Normalizer/IdResponseNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class IdResponseNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\IdResponse';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\IdResponse';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\IdResponse();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -41,12 +50,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getId()) {
-            $data['Id'] = $object->getId();
-        }
+        $data['Id'] = $object->getId();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/ImageDeleteResponseItemNormalizer.php b/src/Normalizer/ImageDeleteResponseItemNormalizer.php
index 807e791..e06605d 100644
--- a/src/Normalizer/ImageDeleteResponseItemNormalizer.php
+++ b/src/Normalizer/ImageDeleteResponseItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImageDeleteResponseItemNormalizer implements DenormalizerInterface, Normal
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImageDeleteResponseItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImageDeleteResponseItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImageDeleteResponseItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Untagged', $data) && $data['Untagged'] !== null) {
             $object->setUntagged($data['Untagged']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ImageIDNormalizer.php b/src/Normalizer/ImageIDNormalizer.php
index 79221c3..a42e66d 100644
--- a/src/Normalizer/ImageIDNormalizer.php
+++ b/src/Normalizer/ImageIDNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImageIDNormalizer implements DenormalizerInterface, NormalizerInterface, D
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImageID';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImageID';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImageID();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ImageMetadataNormalizer.php b/src/Normalizer/ImageMetadataNormalizer.php
index 080de39..4a794f2 100644
--- a/src/Normalizer/ImageMetadataNormalizer.php
+++ b/src/Normalizer/ImageMetadataNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImageMetadataNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImageMetadata';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImageMetadata';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImageMetadata();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('LastTagTime', $data) && $data['LastTagTime'] !== null) {
             $object->setLastTagTime($data['LastTagTime']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ImageNormalizer.php b/src/Normalizer/ImageNormalizer.php
index cab5451..6960b75 100644
--- a/src/Normalizer/ImageNormalizer.php
+++ b/src/Normalizer/ImageNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImageNormalizer implements DenormalizerInterface, NormalizerInterface, Den
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Image';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Image';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Image();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -157,12 +166,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getId()) {
-            $data['Id'] = $object->getId();
-        }
+        $data['Id'] = $object->getId();
         if (null !== $object->getRepoTags()) {
             $values = array();
             foreach ($object->getRepoTags() as $value) {
@@ -177,51 +187,27 @@ public function normalize($object, $format = null, array $context = array())
             }
             $data['RepoDigests'] = $values_1;
         }
-        if (null !== $object->getParent()) {
-            $data['Parent'] = $object->getParent();
-        }
-        if (null !== $object->getComment()) {
-            $data['Comment'] = $object->getComment();
-        }
-        if (null !== $object->getCreated()) {
-            $data['Created'] = $object->getCreated();
-        }
-        if (null !== $object->getContainer()) {
-            $data['Container'] = $object->getContainer();
-        }
+        $data['Parent'] = $object->getParent();
+        $data['Comment'] = $object->getComment();
+        $data['Created'] = $object->getCreated();
+        $data['Container'] = $object->getContainer();
         if (null !== $object->getContainerConfig()) {
             $data['ContainerConfig'] = $this->normalizer->normalize($object->getContainerConfig(), 'json', $context);
         }
-        if (null !== $object->getDockerVersion()) {
-            $data['DockerVersion'] = $object->getDockerVersion();
-        }
-        if (null !== $object->getAuthor()) {
-            $data['Author'] = $object->getAuthor();
-        }
+        $data['DockerVersion'] = $object->getDockerVersion();
+        $data['Author'] = $object->getAuthor();
         if (null !== $object->getConfig()) {
             $data['Config'] = $this->normalizer->normalize($object->getConfig(), 'json', $context);
         }
-        if (null !== $object->getArchitecture()) {
-            $data['Architecture'] = $object->getArchitecture();
-        }
-        if (null !== $object->getOs()) {
-            $data['Os'] = $object->getOs();
-        }
+        $data['Architecture'] = $object->getArchitecture();
+        $data['Os'] = $object->getOs();
         if (null !== $object->getOsVersion()) {
             $data['OsVersion'] = $object->getOsVersion();
         }
-        if (null !== $object->getSize()) {
-            $data['Size'] = $object->getSize();
-        }
-        if (null !== $object->getVirtualSize()) {
-            $data['VirtualSize'] = $object->getVirtualSize();
-        }
-        if (null !== $object->getGraphDriver()) {
-            $data['GraphDriver'] = $this->normalizer->normalize($object->getGraphDriver(), 'json', $context);
-        }
-        if (null !== $object->getRootFS()) {
-            $data['RootFS'] = $this->normalizer->normalize($object->getRootFS(), 'json', $context);
-        }
+        $data['Size'] = $object->getSize();
+        $data['VirtualSize'] = $object->getVirtualSize();
+        $data['GraphDriver'] = $this->normalizer->normalize($object->getGraphDriver(), 'json', $context);
+        $data['RootFS'] = $this->normalizer->normalize($object->getRootFS(), 'json', $context);
         if (null !== $object->getMetadata()) {
             $data['Metadata'] = $this->normalizer->normalize($object->getMetadata(), 'json', $context);
         }
diff --git a/src/Normalizer/ImageRootFSNormalizer.php b/src/Normalizer/ImageRootFSNormalizer.php
index 5a1684c..5af9120 100644
--- a/src/Normalizer/ImageRootFSNormalizer.php
+++ b/src/Normalizer/ImageRootFSNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImageRootFSNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImageRootFS';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImageRootFS';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImageRootFS();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Type', $data) && $data['Type'] !== null) {
             $object->setType($data['Type']);
         }
@@ -57,12 +66,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getType()) {
-            $data['Type'] = $object->getType();
-        }
+        $data['Type'] = $object->getType();
         if (null !== $object->getLayers()) {
             $values = array();
             foreach ($object->getLayers() as $value) {
diff --git a/src/Normalizer/ImageSummaryNormalizer.php b/src/Normalizer/ImageSummaryNormalizer.php
index ad7bbd6..91b14ad 100644
--- a/src/Normalizer/ImageSummaryNormalizer.php
+++ b/src/Normalizer/ImageSummaryNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImageSummaryNormalizer implements DenormalizerInterface, NormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImageSummary';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImageSummary';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImageSummary();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -107,51 +116,34 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getId()) {
-            $data['Id'] = $object->getId();
-        }
-        if (null !== $object->getParentId()) {
-            $data['ParentId'] = $object->getParentId();
-        }
-        if (null !== $object->getRepoTags()) {
-            $values = array();
-            foreach ($object->getRepoTags() as $value) {
-                $values[] = $value;
-            }
-            $data['RepoTags'] = $values;
-        }
-        if (null !== $object->getRepoDigests()) {
-            $values_1 = array();
-            foreach ($object->getRepoDigests() as $value_1) {
-                $values_1[] = $value_1;
-            }
-            $data['RepoDigests'] = $values_1;
-        }
-        if (null !== $object->getCreated()) {
-            $data['Created'] = $object->getCreated();
-        }
-        if (null !== $object->getSize()) {
-            $data['Size'] = $object->getSize();
-        }
-        if (null !== $object->getSharedSize()) {
-            $data['SharedSize'] = $object->getSharedSize();
-        }
-        if (null !== $object->getVirtualSize()) {
-            $data['VirtualSize'] = $object->getVirtualSize();
-        }
-        if (null !== $object->getLabels()) {
-            $values_2 = array();
-            foreach ($object->getLabels() as $key => $value_2) {
-                $values_2[$key] = $value_2;
-            }
-            $data['Labels'] = $values_2;
-        }
-        if (null !== $object->getContainers()) {
-            $data['Containers'] = $object->getContainers();
-        }
+        $data['Id'] = $object->getId();
+        $data['ParentId'] = $object->getParentId();
+        $values = array();
+        foreach ($object->getRepoTags() as $value) {
+            $values[] = $value;
+        }
+        $data['RepoTags'] = $values;
+        $values_1 = array();
+        foreach ($object->getRepoDigests() as $value_1) {
+            $values_1[] = $value_1;
+        }
+        $data['RepoDigests'] = $values_1;
+        $data['Created'] = $object->getCreated();
+        $data['Size'] = $object->getSize();
+        $data['SharedSize'] = $object->getSharedSize();
+        $data['VirtualSize'] = $object->getVirtualSize();
+        $values_2 = array();
+        foreach ($object->getLabels() as $key => $value_2) {
+            $values_2[$key] = $value_2;
+        }
+        $data['Labels'] = $values_2;
+        $data['Containers'] = $object->getContainers();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/ImagesNameHistoryGetResponse200ItemNormalizer.php b/src/Normalizer/ImagesNameHistoryGetResponse200ItemNormalizer.php
index e190dd4..33c05af 100644
--- a/src/Normalizer/ImagesNameHistoryGetResponse200ItemNormalizer.php
+++ b/src/Normalizer/ImagesNameHistoryGetResponse200ItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImagesNameHistoryGetResponse200ItemNormalizer implements DenormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImagesNameHistoryGetResponse200Item';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImagesNameHistoryGetResponse200Item';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImagesNameHistoryGetResponse200Item();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -75,31 +84,22 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getId()) {
-            $data['Id'] = $object->getId();
-        }
-        if (null !== $object->getCreated()) {
-            $data['Created'] = $object->getCreated();
-        }
-        if (null !== $object->getCreatedBy()) {
-            $data['CreatedBy'] = $object->getCreatedBy();
-        }
-        if (null !== $object->getTags()) {
-            $values = array();
-            foreach ($object->getTags() as $value) {
-                $values[] = $value;
-            }
-            $data['Tags'] = $values;
-        }
-        if (null !== $object->getSize()) {
-            $data['Size'] = $object->getSize();
-        }
-        if (null !== $object->getComment()) {
-            $data['Comment'] = $object->getComment();
-        }
+        $data['Id'] = $object->getId();
+        $data['Created'] = $object->getCreated();
+        $data['CreatedBy'] = $object->getCreatedBy();
+        $values = array();
+        foreach ($object->getTags() as $value) {
+            $values[] = $value;
+        }
+        $data['Tags'] = $values;
+        $data['Size'] = $object->getSize();
+        $data['Comment'] = $object->getComment();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/ImagesPrunePostResponse200Normalizer.php b/src/Normalizer/ImagesPrunePostResponse200Normalizer.php
index b80606a..9ade4f5 100644
--- a/src/Normalizer/ImagesPrunePostResponse200Normalizer.php
+++ b/src/Normalizer/ImagesPrunePostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImagesPrunePostResponse200Normalizer implements DenormalizerInterface, Nor
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImagesPrunePostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImagesPrunePostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImagesPrunePostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ImagesDeleted', $data) && $data['ImagesDeleted'] !== null) {
             $values = array();
             foreach ($data['ImagesDeleted'] as $value) {
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ImagesSearchGetResponse200ItemNormalizer.php b/src/Normalizer/ImagesSearchGetResponse200ItemNormalizer.php
index 1a8275d..607d9a2 100644
--- a/src/Normalizer/ImagesSearchGetResponse200ItemNormalizer.php
+++ b/src/Normalizer/ImagesSearchGetResponse200ItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ImagesSearchGetResponse200ItemNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ImagesSearchGetResponse200Item';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ImagesSearchGetResponse200Item';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ImagesSearchGetResponse200Item();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('description', $data) && $data['description'] !== null) {
             $object->setDescription($data['description']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/IndexInfoNormalizer.php b/src/Normalizer/IndexInfoNormalizer.php
index 500b969..ca4c449 100644
--- a/src/Normalizer/IndexInfoNormalizer.php
+++ b/src/Normalizer/IndexInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class IndexInfoNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\IndexInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\IndexInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\IndexInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/JaneObjectNormalizer.php b/src/Normalizer/JaneObjectNormalizer.php
index 11d27d6..b5b3c58 100644
--- a/src/Normalizer/JaneObjectNormalizer.php
+++ b/src/Normalizer/JaneObjectNormalizer.php
@@ -2,7 +2,7 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
@@ -14,21 +14,33 @@ class JaneObjectNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
-    protected $normalizers = array('Docker\\Api\\Model\\Port' => 'Docker\\Api\\Normalizer\\PortNormalizer', 'Docker\\Api\\Model\\MountPoint' => 'Docker\\Api\\Normalizer\\MountPointNormalizer', 'Docker\\Api\\Model\\DeviceMapping' => 'Docker\\Api\\Normalizer\\DeviceMappingNormalizer', 'Docker\\Api\\Model\\DeviceRequest' => 'Docker\\Api\\Normalizer\\DeviceRequestNormalizer', 'Docker\\Api\\Model\\ThrottleDevice' => 'Docker\\Api\\Normalizer\\ThrottleDeviceNormalizer', 'Docker\\Api\\Model\\Mount' => 'Docker\\Api\\Normalizer\\MountNormalizer', 'Docker\\Api\\Model\\MountBindOptions' => 'Docker\\Api\\Normalizer\\MountBindOptionsNormalizer', 'Docker\\Api\\Model\\MountVolumeOptions' => 'Docker\\Api\\Normalizer\\MountVolumeOptionsNormalizer', 'Docker\\Api\\Model\\MountVolumeOptionsDriverConfig' => 'Docker\\Api\\Normalizer\\MountVolumeOptionsDriverConfigNormalizer', 'Docker\\Api\\Model\\MountTmpfsOptions' => 'Docker\\Api\\Normalizer\\MountTmpfsOptionsNormalizer', 'Docker\\Api\\Model\\RestartPolicy' => 'Docker\\Api\\Normalizer\\RestartPolicyNormalizer', 'Docker\\Api\\Model\\Resources' => 'Docker\\Api\\Normalizer\\ResourcesNormalizer', 'Docker\\Api\\Model\\ResourcesBlkioWeightDeviceItem' => 'Docker\\Api\\Normalizer\\ResourcesBlkioWeightDeviceItemNormalizer', 'Docker\\Api\\Model\\ResourcesUlimitsItem' => 'Docker\\Api\\Normalizer\\ResourcesUlimitsItemNormalizer', 'Docker\\Api\\Model\\ResourceObject' => 'Docker\\Api\\Normalizer\\ResourceObjectNormalizer', 'Docker\\Api\\Model\\GenericResourcesItem' => 'Docker\\Api\\Normalizer\\GenericResourcesItemNormalizer', 'Docker\\Api\\Model\\GenericResourcesItemNamedResourceSpec' => 'Docker\\Api\\Normalizer\\GenericResourcesItemNamedResourceSpecNormalizer', 'Docker\\Api\\Model\\GenericResourcesItemDiscreteResourceSpec' => 'Docker\\Api\\Normalizer\\GenericResourcesItemDiscreteResourceSpecNormalizer', 'Docker\\Api\\Model\\HealthConfig' => 'Docker\\Api\\Normalizer\\HealthConfigNormalizer', 'Docker\\Api\\Model\\Health' => 'Docker\\Api\\Normalizer\\HealthNormalizer', 'Docker\\Api\\Model\\HealthcheckResult' => 'Docker\\Api\\Normalizer\\HealthcheckResultNormalizer', 'Docker\\Api\\Model\\HostConfig' => 'Docker\\Api\\Normalizer\\HostConfigNormalizer', 'Docker\\Api\\Model\\HostConfigLogConfig' => 'Docker\\Api\\Normalizer\\HostConfigLogConfigNormalizer', 'Docker\\Api\\Model\\ContainerConfig' => 'Docker\\Api\\Normalizer\\ContainerConfigNormalizer', 'Docker\\Api\\Model\\NetworkingConfig' => 'Docker\\Api\\Normalizer\\NetworkingConfigNormalizer', 'Docker\\Api\\Model\\NetworkSettings' => 'Docker\\Api\\Normalizer\\NetworkSettingsNormalizer', 'Docker\\Api\\Model\\Address' => 'Docker\\Api\\Normalizer\\AddressNormalizer', 'Docker\\Api\\Model\\PortBinding' => 'Docker\\Api\\Normalizer\\PortBindingNormalizer', 'Docker\\Api\\Model\\GraphDriverData' => 'Docker\\Api\\Normalizer\\GraphDriverDataNormalizer', 'Docker\\Api\\Model\\Image' => 'Docker\\Api\\Normalizer\\ImageNormalizer', 'Docker\\Api\\Model\\ImageRootFS' => 'Docker\\Api\\Normalizer\\ImageRootFSNormalizer', 'Docker\\Api\\Model\\ImageMetadata' => 'Docker\\Api\\Normalizer\\ImageMetadataNormalizer', 'Docker\\Api\\Model\\ImageSummary' => 'Docker\\Api\\Normalizer\\ImageSummaryNormalizer', 'Docker\\Api\\Model\\AuthConfig' => 'Docker\\Api\\Normalizer\\AuthConfigNormalizer', 'Docker\\Api\\Model\\ProcessConfig' => 'Docker\\Api\\Normalizer\\ProcessConfigNormalizer', 'Docker\\Api\\Model\\Volume' => 'Docker\\Api\\Normalizer\\VolumeNormalizer', 'Docker\\Api\\Model\\VolumeUsageData' => 'Docker\\Api\\Normalizer\\VolumeUsageDataNormalizer', 'Docker\\Api\\Model\\Network' => 'Docker\\Api\\Normalizer\\NetworkNormalizer', 'Docker\\Api\\Model\\IPAM' => 'Docker\\Api\\Normalizer\\IPAMNormalizer', 'Docker\\Api\\Model\\NetworkContainer' => 'Docker\\Api\\Normalizer\\NetworkContainerNormalizer', 'Docker\\Api\\Model\\BuildInfo' => 'Docker\\Api\\Normalizer\\BuildInfoNormalizer', 'Docker\\Api\\Model\\BuildCache' => 'Docker\\Api\\Normalizer\\BuildCacheNormalizer', 'Docker\\Api\\Model\\ImageID' => 'Docker\\Api\\Normalizer\\ImageIDNormalizer', 'Docker\\Api\\Model\\CreateImageInfo' => 'Docker\\Api\\Normalizer\\CreateImageInfoNormalizer', 'Docker\\Api\\Model\\PushImageInfo' => 'Docker\\Api\\Normalizer\\PushImageInfoNormalizer', 'Docker\\Api\\Model\\ErrorDetail' => 'Docker\\Api\\Normalizer\\ErrorDetailNormalizer', 'Docker\\Api\\Model\\ProgressDetail' => 'Docker\\Api\\Normalizer\\ProgressDetailNormalizer', 'Docker\\Api\\Model\\ErrorResponse' => 'Docker\\Api\\Normalizer\\ErrorResponseNormalizer', 'Docker\\Api\\Model\\IdResponse' => 'Docker\\Api\\Normalizer\\IdResponseNormalizer', 'Docker\\Api\\Model\\EndpointSettings' => 'Docker\\Api\\Normalizer\\EndpointSettingsNormalizer', 'Docker\\Api\\Model\\EndpointIPAMConfig' => 'Docker\\Api\\Normalizer\\EndpointIPAMConfigNormalizer', 'Docker\\Api\\Model\\PluginMount' => 'Docker\\Api\\Normalizer\\PluginMountNormalizer', 'Docker\\Api\\Model\\PluginDevice' => 'Docker\\Api\\Normalizer\\PluginDeviceNormalizer', 'Docker\\Api\\Model\\PluginEnv' => 'Docker\\Api\\Normalizer\\PluginEnvNormalizer', 'Docker\\Api\\Model\\PluginInterfaceType' => 'Docker\\Api\\Normalizer\\PluginInterfaceTypeNormalizer', 'Docker\\Api\\Model\\Plugin' => 'Docker\\Api\\Normalizer\\PluginNormalizer', 'Docker\\Api\\Model\\PluginSettings' => 'Docker\\Api\\Normalizer\\PluginSettingsNormalizer', 'Docker\\Api\\Model\\PluginConfig' => 'Docker\\Api\\Normalizer\\PluginConfigNormalizer', 'Docker\\Api\\Model\\PluginConfigInterface' => 'Docker\\Api\\Normalizer\\PluginConfigInterfaceNormalizer', 'Docker\\Api\\Model\\PluginConfigUser' => 'Docker\\Api\\Normalizer\\PluginConfigUserNormalizer', 'Docker\\Api\\Model\\PluginConfigNetwork' => 'Docker\\Api\\Normalizer\\PluginConfigNetworkNormalizer', 'Docker\\Api\\Model\\PluginConfigLinux' => 'Docker\\Api\\Normalizer\\PluginConfigLinuxNormalizer', 'Docker\\Api\\Model\\PluginConfigArgs' => 'Docker\\Api\\Normalizer\\PluginConfigArgsNormalizer', 'Docker\\Api\\Model\\PluginConfigRootfs' => 'Docker\\Api\\Normalizer\\PluginConfigRootfsNormalizer', 'Docker\\Api\\Model\\ObjectVersion' => 'Docker\\Api\\Normalizer\\ObjectVersionNormalizer', 'Docker\\Api\\Model\\NodeSpec' => 'Docker\\Api\\Normalizer\\NodeSpecNormalizer', 'Docker\\Api\\Model\\Node' => 'Docker\\Api\\Normalizer\\NodeNormalizer', 'Docker\\Api\\Model\\NodeDescription' => 'Docker\\Api\\Normalizer\\NodeDescriptionNormalizer', 'Docker\\Api\\Model\\Platform' => 'Docker\\Api\\Normalizer\\PlatformNormalizer', 'Docker\\Api\\Model\\EngineDescription' => 'Docker\\Api\\Normalizer\\EngineDescriptionNormalizer', 'Docker\\Api\\Model\\EngineDescriptionPluginsItem' => 'Docker\\Api\\Normalizer\\EngineDescriptionPluginsItemNormalizer', 'Docker\\Api\\Model\\TLSInfo' => 'Docker\\Api\\Normalizer\\TLSInfoNormalizer', 'Docker\\Api\\Model\\NodeStatus' => 'Docker\\Api\\Normalizer\\NodeStatusNormalizer', 'Docker\\Api\\Model\\ManagerStatus' => 'Docker\\Api\\Normalizer\\ManagerStatusNormalizer', 'Docker\\Api\\Model\\SwarmSpec' => 'Docker\\Api\\Normalizer\\SwarmSpecNormalizer', 'Docker\\Api\\Model\\SwarmSpecOrchestration' => 'Docker\\Api\\Normalizer\\SwarmSpecOrchestrationNormalizer', 'Docker\\Api\\Model\\SwarmSpecRaft' => 'Docker\\Api\\Normalizer\\SwarmSpecRaftNormalizer', 'Docker\\Api\\Model\\SwarmSpecDispatcher' => 'Docker\\Api\\Normalizer\\SwarmSpecDispatcherNormalizer', 'Docker\\Api\\Model\\SwarmSpecCAConfig' => 'Docker\\Api\\Normalizer\\SwarmSpecCAConfigNormalizer', 'Docker\\Api\\Model\\SwarmSpecCAConfigExternalCAsItem' => 'Docker\\Api\\Normalizer\\SwarmSpecCAConfigExternalCAsItemNormalizer', 'Docker\\Api\\Model\\SwarmSpecEncryptionConfig' => 'Docker\\Api\\Normalizer\\SwarmSpecEncryptionConfigNormalizer', 'Docker\\Api\\Model\\SwarmSpecTaskDefaults' => 'Docker\\Api\\Normalizer\\SwarmSpecTaskDefaultsNormalizer', 'Docker\\Api\\Model\\SwarmSpecTaskDefaultsLogDriver' => 'Docker\\Api\\Normalizer\\SwarmSpecTaskDefaultsLogDriverNormalizer', 'Docker\\Api\\Model\\ClusterInfo' => 'Docker\\Api\\Normalizer\\ClusterInfoNormalizer', 'Docker\\Api\\Model\\JoinTokens' => 'Docker\\Api\\Normalizer\\JoinTokensNormalizer', 'Docker\\Api\\Model\\Swarm' => 'Docker\\Api\\Normalizer\\SwarmNormalizer', 'Docker\\Api\\Model\\TaskSpec' => 'Docker\\Api\\Normalizer\\TaskSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecPluginSpec' => 'Docker\\Api\\Normalizer\\TaskSpecPluginSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecPluginSpecPluginPrivilegeItem' => 'Docker\\Api\\Normalizer\\TaskSpecPluginSpecPluginPrivilegeItemNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpec' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivileges' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecPrivilegesNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesCredentialSpec' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesSELinuxContext' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecDNSConfig' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecDNSConfigNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItem' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecSecretsItemNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItemFile' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecSecretsItemFileNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItem' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecConfigsItemNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItemFile' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecConfigsItemFileNormalizer', 'Docker\\Api\\Model\\TaskSpecNetworkAttachmentSpec' => 'Docker\\Api\\Normalizer\\TaskSpecNetworkAttachmentSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecResources' => 'Docker\\Api\\Normalizer\\TaskSpecResourcesNormalizer', 'Docker\\Api\\Model\\TaskSpecRestartPolicy' => 'Docker\\Api\\Normalizer\\TaskSpecRestartPolicyNormalizer', 'Docker\\Api\\Model\\TaskSpecPlacement' => 'Docker\\Api\\Normalizer\\TaskSpecPlacementNormalizer', 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItem' => 'Docker\\Api\\Normalizer\\TaskSpecPlacementPreferencesItemNormalizer', 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItemSpread' => 'Docker\\Api\\Normalizer\\TaskSpecPlacementPreferencesItemSpreadNormalizer', 'Docker\\Api\\Model\\TaskSpecLogDriver' => 'Docker\\Api\\Normalizer\\TaskSpecLogDriverNormalizer', 'Docker\\Api\\Model\\Task' => 'Docker\\Api\\Normalizer\\TaskNormalizer', 'Docker\\Api\\Model\\TaskStatus' => 'Docker\\Api\\Normalizer\\TaskStatusNormalizer', 'Docker\\Api\\Model\\TaskStatusContainerStatus' => 'Docker\\Api\\Normalizer\\TaskStatusContainerStatusNormalizer', 'Docker\\Api\\Model\\ServiceSpec' => 'Docker\\Api\\Normalizer\\ServiceSpecNormalizer', 'Docker\\Api\\Model\\ServiceSpecMode' => 'Docker\\Api\\Normalizer\\ServiceSpecModeNormalizer', 'Docker\\Api\\Model\\ServiceSpecModeReplicated' => 'Docker\\Api\\Normalizer\\ServiceSpecModeReplicatedNormalizer', 'Docker\\Api\\Model\\ServiceSpecUpdateConfig' => 'Docker\\Api\\Normalizer\\ServiceSpecUpdateConfigNormalizer', 'Docker\\Api\\Model\\ServiceSpecRollbackConfig' => 'Docker\\Api\\Normalizer\\ServiceSpecRollbackConfigNormalizer', 'Docker\\Api\\Model\\EndpointPortConfig' => 'Docker\\Api\\Normalizer\\EndpointPortConfigNormalizer', 'Docker\\Api\\Model\\EndpointSpec' => 'Docker\\Api\\Normalizer\\EndpointSpecNormalizer', 'Docker\\Api\\Model\\Service' => 'Docker\\Api\\Normalizer\\ServiceNormalizer', 'Docker\\Api\\Model\\ServiceEndpoint' => 'Docker\\Api\\Normalizer\\ServiceEndpointNormalizer', 'Docker\\Api\\Model\\ServiceEndpointVirtualIPsItem' => 'Docker\\Api\\Normalizer\\ServiceEndpointVirtualIPsItemNormalizer', 'Docker\\Api\\Model\\ServiceUpdateStatus' => 'Docker\\Api\\Normalizer\\ServiceUpdateStatusNormalizer', 'Docker\\Api\\Model\\ImageDeleteResponseItem' => 'Docker\\Api\\Normalizer\\ImageDeleteResponseItemNormalizer', 'Docker\\Api\\Model\\ServiceUpdateResponse' => 'Docker\\Api\\Normalizer\\ServiceUpdateResponseNormalizer', 'Docker\\Api\\Model\\ContainerSummaryItem' => 'Docker\\Api\\Normalizer\\ContainerSummaryItemNormalizer', 'Docker\\Api\\Model\\ContainerSummaryItemHostConfig' => 'Docker\\Api\\Normalizer\\ContainerSummaryItemHostConfigNormalizer', 'Docker\\Api\\Model\\ContainerSummaryItemNetworkSettings' => 'Docker\\Api\\Normalizer\\ContainerSummaryItemNetworkSettingsNormalizer', 'Docker\\Api\\Model\\Driver' => 'Docker\\Api\\Normalizer\\DriverNormalizer', 'Docker\\Api\\Model\\SecretSpec' => 'Docker\\Api\\Normalizer\\SecretSpecNormalizer', 'Docker\\Api\\Model\\Secret' => 'Docker\\Api\\Normalizer\\SecretNormalizer', 'Docker\\Api\\Model\\ConfigSpec' => 'Docker\\Api\\Normalizer\\ConfigSpecNormalizer', 'Docker\\Api\\Model\\Config' => 'Docker\\Api\\Normalizer\\ConfigNormalizer', 'Docker\\Api\\Model\\ContainerState' => 'Docker\\Api\\Normalizer\\ContainerStateNormalizer', 'Docker\\Api\\Model\\SystemVersion' => 'Docker\\Api\\Normalizer\\SystemVersionNormalizer', 'Docker\\Api\\Model\\SystemVersionPlatform' => 'Docker\\Api\\Normalizer\\SystemVersionPlatformNormalizer', 'Docker\\Api\\Model\\SystemVersionComponentsItem' => 'Docker\\Api\\Normalizer\\SystemVersionComponentsItemNormalizer', 'Docker\\Api\\Model\\SystemInfo' => 'Docker\\Api\\Normalizer\\SystemInfoNormalizer', 'Docker\\Api\\Model\\PluginsInfo' => 'Docker\\Api\\Normalizer\\PluginsInfoNormalizer', 'Docker\\Api\\Model\\RegistryServiceConfig' => 'Docker\\Api\\Normalizer\\RegistryServiceConfigNormalizer', 'Docker\\Api\\Model\\IndexInfo' => 'Docker\\Api\\Normalizer\\IndexInfoNormalizer', 'Docker\\Api\\Model\\Runtime' => 'Docker\\Api\\Normalizer\\RuntimeNormalizer', 'Docker\\Api\\Model\\Commit' => 'Docker\\Api\\Normalizer\\CommitNormalizer', 'Docker\\Api\\Model\\SwarmInfo' => 'Docker\\Api\\Normalizer\\SwarmInfoNormalizer', 'Docker\\Api\\Model\\PeerNode' => 'Docker\\Api\\Normalizer\\PeerNodeNormalizer', 'Docker\\Api\\Model\\NetworkAttachmentConfig' => 'Docker\\Api\\Normalizer\\NetworkAttachmentConfigNormalizer', 'Docker\\Api\\Model\\ContainersCreatePostBody' => 'Docker\\Api\\Normalizer\\ContainersCreatePostBodyNormalizer', 'Docker\\Api\\Model\\ContainersCreatePostResponse201' => 'Docker\\Api\\Normalizer\\ContainersCreatePostResponse201Normalizer', 'Docker\\Api\\Model\\ContainersIdJsonGetResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdJsonGetResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdTopGetResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdTopGetResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdChangesGetResponse200Item' => 'Docker\\Api\\Normalizer\\ContainersIdChangesGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\ContainersIdUpdatePostBody' => 'Docker\\Api\\Normalizer\\ContainersIdUpdatePostBodyNormalizer', 'Docker\\Api\\Model\\ContainersIdUpdatePostResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdUpdatePostResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdWaitPostResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200Error' => 'Docker\\Api\\Normalizer\\ContainersIdWaitPostResponse200ErrorNormalizer', 'Docker\\Api\\Model\\ContainersIdArchiveGetResponse400' => 'Docker\\Api\\Normalizer\\ContainersIdArchiveGetResponse400Normalizer', 'Docker\\Api\\Model\\ContainersIdArchiveHeadResponse400' => 'Docker\\Api\\Normalizer\\ContainersIdArchiveHeadResponse400Normalizer', 'Docker\\Api\\Model\\ContainersPrunePostResponse200' => 'Docker\\Api\\Normalizer\\ContainersPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\BuildPrunePostResponse200' => 'Docker\\Api\\Normalizer\\BuildPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\ImagesNameHistoryGetResponse200Item' => 'Docker\\Api\\Normalizer\\ImagesNameHistoryGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\ImagesSearchGetResponse200Item' => 'Docker\\Api\\Normalizer\\ImagesSearchGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\ImagesPrunePostResponse200' => 'Docker\\Api\\Normalizer\\ImagesPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\AuthPostResponse200' => 'Docker\\Api\\Normalizer\\AuthPostResponse200Normalizer', 'Docker\\Api\\Model\\EventsGetResponse200' => 'Docker\\Api\\Normalizer\\EventsGetResponse200Normalizer', 'Docker\\Api\\Model\\EventsGetResponse200Actor' => 'Docker\\Api\\Normalizer\\EventsGetResponse200ActorNormalizer', 'Docker\\Api\\Model\\SystemDfGetResponse200' => 'Docker\\Api\\Normalizer\\SystemDfGetResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdExecPostBody' => 'Docker\\Api\\Normalizer\\ContainersIdExecPostBodyNormalizer', 'Docker\\Api\\Model\\ExecIdStartPostBody' => 'Docker\\Api\\Normalizer\\ExecIdStartPostBodyNormalizer', 'Docker\\Api\\Model\\ExecIdJsonGetResponse200' => 'Docker\\Api\\Normalizer\\ExecIdJsonGetResponse200Normalizer', 'Docker\\Api\\Model\\VolumesGetResponse200' => 'Docker\\Api\\Normalizer\\VolumesGetResponse200Normalizer', 'Docker\\Api\\Model\\VolumesCreatePostBody' => 'Docker\\Api\\Normalizer\\VolumesCreatePostBodyNormalizer', 'Docker\\Api\\Model\\VolumesPrunePostResponse200' => 'Docker\\Api\\Normalizer\\VolumesPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\NetworksCreatePostBody' => 'Docker\\Api\\Normalizer\\NetworksCreatePostBodyNormalizer', 'Docker\\Api\\Model\\NetworksCreatePostResponse201' => 'Docker\\Api\\Normalizer\\NetworksCreatePostResponse201Normalizer', 'Docker\\Api\\Model\\NetworksIdConnectPostBody' => 'Docker\\Api\\Normalizer\\NetworksIdConnectPostBodyNormalizer', 'Docker\\Api\\Model\\NetworksIdDisconnectPostBody' => 'Docker\\Api\\Normalizer\\NetworksIdDisconnectPostBodyNormalizer', 'Docker\\Api\\Model\\NetworksPrunePostResponse200' => 'Docker\\Api\\Normalizer\\NetworksPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\PluginsPrivilegesGetResponse200Item' => 'Docker\\Api\\Normalizer\\PluginsPrivilegesGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\PluginsPullPostBodyItem' => 'Docker\\Api\\Normalizer\\PluginsPullPostBodyItemNormalizer', 'Docker\\Api\\Model\\PluginsNameUpgradePostBodyItem' => 'Docker\\Api\\Normalizer\\PluginsNameUpgradePostBodyItemNormalizer', 'Docker\\Api\\Model\\SwarmInitPostBody' => 'Docker\\Api\\Normalizer\\SwarmInitPostBodyNormalizer', 'Docker\\Api\\Model\\SwarmJoinPostBody' => 'Docker\\Api\\Normalizer\\SwarmJoinPostBodyNormalizer', 'Docker\\Api\\Model\\SwarmUnlockkeyGetResponse200' => 'Docker\\Api\\Normalizer\\SwarmUnlockkeyGetResponse200Normalizer', 'Docker\\Api\\Model\\SwarmUnlockPostBody' => 'Docker\\Api\\Normalizer\\SwarmUnlockPostBodyNormalizer', 'Docker\\Api\\Model\\ServicesCreatePostBody' => 'Docker\\Api\\Normalizer\\ServicesCreatePostBodyNormalizer', 'Docker\\Api\\Model\\ServicesCreatePostResponse201' => 'Docker\\Api\\Normalizer\\ServicesCreatePostResponse201Normalizer', 'Docker\\Api\\Model\\ServicesIdUpdatePostBody' => 'Docker\\Api\\Normalizer\\ServicesIdUpdatePostBodyNormalizer', 'Docker\\Api\\Model\\SecretsCreatePostBody' => 'Docker\\Api\\Normalizer\\SecretsCreatePostBodyNormalizer', 'Docker\\Api\\Model\\ConfigsCreatePostBody' => 'Docker\\Api\\Normalizer\\ConfigsCreatePostBodyNormalizer', 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200' => 'Docker\\Api\\Normalizer\\DistributionNameJsonGetResponse200Normalizer', 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200Descriptor' => 'Docker\\Api\\Normalizer\\DistributionNameJsonGetResponse200DescriptorNormalizer', 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200PlatformsItem' => 'Docker\\Api\\Normalizer\\DistributionNameJsonGetResponse200PlatformsItemNormalizer', '\\Jane\\JsonSchemaRuntime\\Reference' => '\\Jane\\JsonSchemaRuntime\\Normalizer\\ReferenceNormalizer'), $normalizersCache = array();
+    protected $normalizers = array('Docker\\Api\\Model\\Port' => 'Docker\\Api\\Normalizer\\PortNormalizer', 'Docker\\Api\\Model\\MountPoint' => 'Docker\\Api\\Normalizer\\MountPointNormalizer', 'Docker\\Api\\Model\\DeviceMapping' => 'Docker\\Api\\Normalizer\\DeviceMappingNormalizer', 'Docker\\Api\\Model\\DeviceRequest' => 'Docker\\Api\\Normalizer\\DeviceRequestNormalizer', 'Docker\\Api\\Model\\ThrottleDevice' => 'Docker\\Api\\Normalizer\\ThrottleDeviceNormalizer', 'Docker\\Api\\Model\\Mount' => 'Docker\\Api\\Normalizer\\MountNormalizer', 'Docker\\Api\\Model\\MountBindOptions' => 'Docker\\Api\\Normalizer\\MountBindOptionsNormalizer', 'Docker\\Api\\Model\\MountVolumeOptions' => 'Docker\\Api\\Normalizer\\MountVolumeOptionsNormalizer', 'Docker\\Api\\Model\\MountVolumeOptionsDriverConfig' => 'Docker\\Api\\Normalizer\\MountVolumeOptionsDriverConfigNormalizer', 'Docker\\Api\\Model\\MountTmpfsOptions' => 'Docker\\Api\\Normalizer\\MountTmpfsOptionsNormalizer', 'Docker\\Api\\Model\\RestartPolicy' => 'Docker\\Api\\Normalizer\\RestartPolicyNormalizer', 'Docker\\Api\\Model\\Resources' => 'Docker\\Api\\Normalizer\\ResourcesNormalizer', 'Docker\\Api\\Model\\ResourcesBlkioWeightDeviceItem' => 'Docker\\Api\\Normalizer\\ResourcesBlkioWeightDeviceItemNormalizer', 'Docker\\Api\\Model\\ResourcesUlimitsItem' => 'Docker\\Api\\Normalizer\\ResourcesUlimitsItemNormalizer', 'Docker\\Api\\Model\\ResourceObject' => 'Docker\\Api\\Normalizer\\ResourceObjectNormalizer', 'Docker\\Api\\Model\\GenericResourcesItem' => 'Docker\\Api\\Normalizer\\GenericResourcesItemNormalizer', 'Docker\\Api\\Model\\GenericResourcesItemNamedResourceSpec' => 'Docker\\Api\\Normalizer\\GenericResourcesItemNamedResourceSpecNormalizer', 'Docker\\Api\\Model\\GenericResourcesItemDiscreteResourceSpec' => 'Docker\\Api\\Normalizer\\GenericResourcesItemDiscreteResourceSpecNormalizer', 'Docker\\Api\\Model\\HealthConfig' => 'Docker\\Api\\Normalizer\\HealthConfigNormalizer', 'Docker\\Api\\Model\\Health' => 'Docker\\Api\\Normalizer\\HealthNormalizer', 'Docker\\Api\\Model\\HealthcheckResult' => 'Docker\\Api\\Normalizer\\HealthcheckResultNormalizer', 'Docker\\Api\\Model\\HostConfig' => 'Docker\\Api\\Normalizer\\HostConfigNormalizer', 'Docker\\Api\\Model\\HostConfigLogConfig' => 'Docker\\Api\\Normalizer\\HostConfigLogConfigNormalizer', 'Docker\\Api\\Model\\ContainerConfig' => 'Docker\\Api\\Normalizer\\ContainerConfigNormalizer', 'Docker\\Api\\Model\\NetworkingConfig' => 'Docker\\Api\\Normalizer\\NetworkingConfigNormalizer', 'Docker\\Api\\Model\\NetworkSettings' => 'Docker\\Api\\Normalizer\\NetworkSettingsNormalizer', 'Docker\\Api\\Model\\Address' => 'Docker\\Api\\Normalizer\\AddressNormalizer', 'Docker\\Api\\Model\\PortBinding' => 'Docker\\Api\\Normalizer\\PortBindingNormalizer', 'Docker\\Api\\Model\\GraphDriverData' => 'Docker\\Api\\Normalizer\\GraphDriverDataNormalizer', 'Docker\\Api\\Model\\Image' => 'Docker\\Api\\Normalizer\\ImageNormalizer', 'Docker\\Api\\Model\\ImageRootFS' => 'Docker\\Api\\Normalizer\\ImageRootFSNormalizer', 'Docker\\Api\\Model\\ImageMetadata' => 'Docker\\Api\\Normalizer\\ImageMetadataNormalizer', 'Docker\\Api\\Model\\ImageSummary' => 'Docker\\Api\\Normalizer\\ImageSummaryNormalizer', 'Docker\\Api\\Model\\AuthConfig' => 'Docker\\Api\\Normalizer\\AuthConfigNormalizer', 'Docker\\Api\\Model\\ProcessConfig' => 'Docker\\Api\\Normalizer\\ProcessConfigNormalizer', 'Docker\\Api\\Model\\Volume' => 'Docker\\Api\\Normalizer\\VolumeNormalizer', 'Docker\\Api\\Model\\VolumeUsageData' => 'Docker\\Api\\Normalizer\\VolumeUsageDataNormalizer', 'Docker\\Api\\Model\\Network' => 'Docker\\Api\\Normalizer\\NetworkNormalizer', 'Docker\\Api\\Model\\IPAM' => 'Docker\\Api\\Normalizer\\IPAMNormalizer', 'Docker\\Api\\Model\\NetworkContainer' => 'Docker\\Api\\Normalizer\\NetworkContainerNormalizer', 'Docker\\Api\\Model\\BuildInfo' => 'Docker\\Api\\Normalizer\\BuildInfoNormalizer', 'Docker\\Api\\Model\\BuildCache' => 'Docker\\Api\\Normalizer\\BuildCacheNormalizer', 'Docker\\Api\\Model\\ImageID' => 'Docker\\Api\\Normalizer\\ImageIDNormalizer', 'Docker\\Api\\Model\\CreateImageInfo' => 'Docker\\Api\\Normalizer\\CreateImageInfoNormalizer', 'Docker\\Api\\Model\\PushImageInfo' => 'Docker\\Api\\Normalizer\\PushImageInfoNormalizer', 'Docker\\Api\\Model\\ErrorDetail' => 'Docker\\Api\\Normalizer\\ErrorDetailNormalizer', 'Docker\\Api\\Model\\ProgressDetail' => 'Docker\\Api\\Normalizer\\ProgressDetailNormalizer', 'Docker\\Api\\Model\\ErrorResponse' => 'Docker\\Api\\Normalizer\\ErrorResponseNormalizer', 'Docker\\Api\\Model\\IdResponse' => 'Docker\\Api\\Normalizer\\IdResponseNormalizer', 'Docker\\Api\\Model\\EndpointSettings' => 'Docker\\Api\\Normalizer\\EndpointSettingsNormalizer', 'Docker\\Api\\Model\\EndpointIPAMConfig' => 'Docker\\Api\\Normalizer\\EndpointIPAMConfigNormalizer', 'Docker\\Api\\Model\\PluginMount' => 'Docker\\Api\\Normalizer\\PluginMountNormalizer', 'Docker\\Api\\Model\\PluginDevice' => 'Docker\\Api\\Normalizer\\PluginDeviceNormalizer', 'Docker\\Api\\Model\\PluginEnv' => 'Docker\\Api\\Normalizer\\PluginEnvNormalizer', 'Docker\\Api\\Model\\PluginInterfaceType' => 'Docker\\Api\\Normalizer\\PluginInterfaceTypeNormalizer', 'Docker\\Api\\Model\\Plugin' => 'Docker\\Api\\Normalizer\\PluginNormalizer', 'Docker\\Api\\Model\\PluginSettings' => 'Docker\\Api\\Normalizer\\PluginSettingsNormalizer', 'Docker\\Api\\Model\\PluginConfig' => 'Docker\\Api\\Normalizer\\PluginConfigNormalizer', 'Docker\\Api\\Model\\PluginConfigInterface' => 'Docker\\Api\\Normalizer\\PluginConfigInterfaceNormalizer', 'Docker\\Api\\Model\\PluginConfigUser' => 'Docker\\Api\\Normalizer\\PluginConfigUserNormalizer', 'Docker\\Api\\Model\\PluginConfigNetwork' => 'Docker\\Api\\Normalizer\\PluginConfigNetworkNormalizer', 'Docker\\Api\\Model\\PluginConfigLinux' => 'Docker\\Api\\Normalizer\\PluginConfigLinuxNormalizer', 'Docker\\Api\\Model\\PluginConfigArgs' => 'Docker\\Api\\Normalizer\\PluginConfigArgsNormalizer', 'Docker\\Api\\Model\\PluginConfigRootfs' => 'Docker\\Api\\Normalizer\\PluginConfigRootfsNormalizer', 'Docker\\Api\\Model\\ObjectVersion' => 'Docker\\Api\\Normalizer\\ObjectVersionNormalizer', 'Docker\\Api\\Model\\NodeSpec' => 'Docker\\Api\\Normalizer\\NodeSpecNormalizer', 'Docker\\Api\\Model\\Node' => 'Docker\\Api\\Normalizer\\NodeNormalizer', 'Docker\\Api\\Model\\NodeDescription' => 'Docker\\Api\\Normalizer\\NodeDescriptionNormalizer', 'Docker\\Api\\Model\\Platform' => 'Docker\\Api\\Normalizer\\PlatformNormalizer', 'Docker\\Api\\Model\\EngineDescription' => 'Docker\\Api\\Normalizer\\EngineDescriptionNormalizer', 'Docker\\Api\\Model\\EngineDescriptionPluginsItem' => 'Docker\\Api\\Normalizer\\EngineDescriptionPluginsItemNormalizer', 'Docker\\Api\\Model\\TLSInfo' => 'Docker\\Api\\Normalizer\\TLSInfoNormalizer', 'Docker\\Api\\Model\\NodeStatus' => 'Docker\\Api\\Normalizer\\NodeStatusNormalizer', 'Docker\\Api\\Model\\ManagerStatus' => 'Docker\\Api\\Normalizer\\ManagerStatusNormalizer', 'Docker\\Api\\Model\\SwarmSpec' => 'Docker\\Api\\Normalizer\\SwarmSpecNormalizer', 'Docker\\Api\\Model\\SwarmSpecOrchestration' => 'Docker\\Api\\Normalizer\\SwarmSpecOrchestrationNormalizer', 'Docker\\Api\\Model\\SwarmSpecRaft' => 'Docker\\Api\\Normalizer\\SwarmSpecRaftNormalizer', 'Docker\\Api\\Model\\SwarmSpecDispatcher' => 'Docker\\Api\\Normalizer\\SwarmSpecDispatcherNormalizer', 'Docker\\Api\\Model\\SwarmSpecCAConfig' => 'Docker\\Api\\Normalizer\\SwarmSpecCAConfigNormalizer', 'Docker\\Api\\Model\\SwarmSpecCAConfigExternalCAsItem' => 'Docker\\Api\\Normalizer\\SwarmSpecCAConfigExternalCAsItemNormalizer', 'Docker\\Api\\Model\\SwarmSpecEncryptionConfig' => 'Docker\\Api\\Normalizer\\SwarmSpecEncryptionConfigNormalizer', 'Docker\\Api\\Model\\SwarmSpecTaskDefaults' => 'Docker\\Api\\Normalizer\\SwarmSpecTaskDefaultsNormalizer', 'Docker\\Api\\Model\\SwarmSpecTaskDefaultsLogDriver' => 'Docker\\Api\\Normalizer\\SwarmSpecTaskDefaultsLogDriverNormalizer', 'Docker\\Api\\Model\\ClusterInfo' => 'Docker\\Api\\Normalizer\\ClusterInfoNormalizer', 'Docker\\Api\\Model\\JoinTokens' => 'Docker\\Api\\Normalizer\\JoinTokensNormalizer', 'Docker\\Api\\Model\\Swarm' => 'Docker\\Api\\Normalizer\\SwarmNormalizer', 'Docker\\Api\\Model\\TaskSpec' => 'Docker\\Api\\Normalizer\\TaskSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecPluginSpec' => 'Docker\\Api\\Normalizer\\TaskSpecPluginSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecPluginSpecPluginPrivilegeItem' => 'Docker\\Api\\Normalizer\\TaskSpecPluginSpecPluginPrivilegeItemNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpec' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivileges' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecPrivilegesNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesCredentialSpec' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesSELinuxContext' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecDNSConfig' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecDNSConfigNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItem' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecSecretsItemNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItemFile' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecSecretsItemFileNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItem' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecConfigsItemNormalizer', 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItemFile' => 'Docker\\Api\\Normalizer\\TaskSpecContainerSpecConfigsItemFileNormalizer', 'Docker\\Api\\Model\\TaskSpecNetworkAttachmentSpec' => 'Docker\\Api\\Normalizer\\TaskSpecNetworkAttachmentSpecNormalizer', 'Docker\\Api\\Model\\TaskSpecResources' => 'Docker\\Api\\Normalizer\\TaskSpecResourcesNormalizer', 'Docker\\Api\\Model\\TaskSpecRestartPolicy' => 'Docker\\Api\\Normalizer\\TaskSpecRestartPolicyNormalizer', 'Docker\\Api\\Model\\TaskSpecPlacement' => 'Docker\\Api\\Normalizer\\TaskSpecPlacementNormalizer', 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItem' => 'Docker\\Api\\Normalizer\\TaskSpecPlacementPreferencesItemNormalizer', 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItemSpread' => 'Docker\\Api\\Normalizer\\TaskSpecPlacementPreferencesItemSpreadNormalizer', 'Docker\\Api\\Model\\TaskSpecLogDriver' => 'Docker\\Api\\Normalizer\\TaskSpecLogDriverNormalizer', 'Docker\\Api\\Model\\Task' => 'Docker\\Api\\Normalizer\\TaskNormalizer', 'Docker\\Api\\Model\\TaskStatus' => 'Docker\\Api\\Normalizer\\TaskStatusNormalizer', 'Docker\\Api\\Model\\TaskStatusContainerStatus' => 'Docker\\Api\\Normalizer\\TaskStatusContainerStatusNormalizer', 'Docker\\Api\\Model\\ServiceSpec' => 'Docker\\Api\\Normalizer\\ServiceSpecNormalizer', 'Docker\\Api\\Model\\ServiceSpecMode' => 'Docker\\Api\\Normalizer\\ServiceSpecModeNormalizer', 'Docker\\Api\\Model\\ServiceSpecModeReplicated' => 'Docker\\Api\\Normalizer\\ServiceSpecModeReplicatedNormalizer', 'Docker\\Api\\Model\\ServiceSpecUpdateConfig' => 'Docker\\Api\\Normalizer\\ServiceSpecUpdateConfigNormalizer', 'Docker\\Api\\Model\\ServiceSpecRollbackConfig' => 'Docker\\Api\\Normalizer\\ServiceSpecRollbackConfigNormalizer', 'Docker\\Api\\Model\\EndpointPortConfig' => 'Docker\\Api\\Normalizer\\EndpointPortConfigNormalizer', 'Docker\\Api\\Model\\EndpointSpec' => 'Docker\\Api\\Normalizer\\EndpointSpecNormalizer', 'Docker\\Api\\Model\\Service' => 'Docker\\Api\\Normalizer\\ServiceNormalizer', 'Docker\\Api\\Model\\ServiceEndpoint' => 'Docker\\Api\\Normalizer\\ServiceEndpointNormalizer', 'Docker\\Api\\Model\\ServiceEndpointVirtualIPsItem' => 'Docker\\Api\\Normalizer\\ServiceEndpointVirtualIPsItemNormalizer', 'Docker\\Api\\Model\\ServiceUpdateStatus' => 'Docker\\Api\\Normalizer\\ServiceUpdateStatusNormalizer', 'Docker\\Api\\Model\\ImageDeleteResponseItem' => 'Docker\\Api\\Normalizer\\ImageDeleteResponseItemNormalizer', 'Docker\\Api\\Model\\ServiceUpdateResponse' => 'Docker\\Api\\Normalizer\\ServiceUpdateResponseNormalizer', 'Docker\\Api\\Model\\ContainerSummaryItem' => 'Docker\\Api\\Normalizer\\ContainerSummaryItemNormalizer', 'Docker\\Api\\Model\\ContainerSummaryItemHostConfig' => 'Docker\\Api\\Normalizer\\ContainerSummaryItemHostConfigNormalizer', 'Docker\\Api\\Model\\ContainerSummaryItemNetworkSettings' => 'Docker\\Api\\Normalizer\\ContainerSummaryItemNetworkSettingsNormalizer', 'Docker\\Api\\Model\\Driver' => 'Docker\\Api\\Normalizer\\DriverNormalizer', 'Docker\\Api\\Model\\SecretSpec' => 'Docker\\Api\\Normalizer\\SecretSpecNormalizer', 'Docker\\Api\\Model\\Secret' => 'Docker\\Api\\Normalizer\\SecretNormalizer', 'Docker\\Api\\Model\\ConfigSpec' => 'Docker\\Api\\Normalizer\\ConfigSpecNormalizer', 'Docker\\Api\\Model\\Config' => 'Docker\\Api\\Normalizer\\ConfigNormalizer', 'Docker\\Api\\Model\\ContainerState' => 'Docker\\Api\\Normalizer\\ContainerStateNormalizer', 'Docker\\Api\\Model\\SystemVersion' => 'Docker\\Api\\Normalizer\\SystemVersionNormalizer', 'Docker\\Api\\Model\\SystemVersionPlatform' => 'Docker\\Api\\Normalizer\\SystemVersionPlatformNormalizer', 'Docker\\Api\\Model\\SystemVersionComponentsItem' => 'Docker\\Api\\Normalizer\\SystemVersionComponentsItemNormalizer', 'Docker\\Api\\Model\\SystemInfo' => 'Docker\\Api\\Normalizer\\SystemInfoNormalizer', 'Docker\\Api\\Model\\PluginsInfo' => 'Docker\\Api\\Normalizer\\PluginsInfoNormalizer', 'Docker\\Api\\Model\\RegistryServiceConfig' => 'Docker\\Api\\Normalizer\\RegistryServiceConfigNormalizer', 'Docker\\Api\\Model\\IndexInfo' => 'Docker\\Api\\Normalizer\\IndexInfoNormalizer', 'Docker\\Api\\Model\\Runtime' => 'Docker\\Api\\Normalizer\\RuntimeNormalizer', 'Docker\\Api\\Model\\Commit' => 'Docker\\Api\\Normalizer\\CommitNormalizer', 'Docker\\Api\\Model\\SwarmInfo' => 'Docker\\Api\\Normalizer\\SwarmInfoNormalizer', 'Docker\\Api\\Model\\PeerNode' => 'Docker\\Api\\Normalizer\\PeerNodeNormalizer', 'Docker\\Api\\Model\\NetworkAttachmentConfig' => 'Docker\\Api\\Normalizer\\NetworkAttachmentConfigNormalizer', 'Docker\\Api\\Model\\ContainersCreatePostBody' => 'Docker\\Api\\Normalizer\\ContainersCreatePostBodyNormalizer', 'Docker\\Api\\Model\\ContainersCreatePostResponse201' => 'Docker\\Api\\Normalizer\\ContainersCreatePostResponse201Normalizer', 'Docker\\Api\\Model\\ContainersIdJsonGetResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdJsonGetResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdTopGetResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdTopGetResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdChangesGetResponse200Item' => 'Docker\\Api\\Normalizer\\ContainersIdChangesGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\ContainersIdUpdatePostBody' => 'Docker\\Api\\Normalizer\\ContainersIdUpdatePostBodyNormalizer', 'Docker\\Api\\Model\\ContainersIdUpdatePostResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdUpdatePostResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200' => 'Docker\\Api\\Normalizer\\ContainersIdWaitPostResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdWaitPostResponse200Error' => 'Docker\\Api\\Normalizer\\ContainersIdWaitPostResponse200ErrorNormalizer', 'Docker\\Api\\Model\\ContainersIdArchiveGetResponse400' => 'Docker\\Api\\Normalizer\\ContainersIdArchiveGetResponse400Normalizer', 'Docker\\Api\\Model\\ContainersIdArchiveHeadResponse400' => 'Docker\\Api\\Normalizer\\ContainersIdArchiveHeadResponse400Normalizer', 'Docker\\Api\\Model\\ContainersPrunePostResponse200' => 'Docker\\Api\\Normalizer\\ContainersPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\BuildPrunePostResponse200' => 'Docker\\Api\\Normalizer\\BuildPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\ImagesNameHistoryGetResponse200Item' => 'Docker\\Api\\Normalizer\\ImagesNameHistoryGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\ImagesSearchGetResponse200Item' => 'Docker\\Api\\Normalizer\\ImagesSearchGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\ImagesPrunePostResponse200' => 'Docker\\Api\\Normalizer\\ImagesPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\AuthPostResponse200' => 'Docker\\Api\\Normalizer\\AuthPostResponse200Normalizer', 'Docker\\Api\\Model\\EventsGetResponse200' => 'Docker\\Api\\Normalizer\\EventsGetResponse200Normalizer', 'Docker\\Api\\Model\\EventsGetResponse200Actor' => 'Docker\\Api\\Normalizer\\EventsGetResponse200ActorNormalizer', 'Docker\\Api\\Model\\SystemDfGetResponse200' => 'Docker\\Api\\Normalizer\\SystemDfGetResponse200Normalizer', 'Docker\\Api\\Model\\ContainersIdExecPostBody' => 'Docker\\Api\\Normalizer\\ContainersIdExecPostBodyNormalizer', 'Docker\\Api\\Model\\ExecIdStartPostBody' => 'Docker\\Api\\Normalizer\\ExecIdStartPostBodyNormalizer', 'Docker\\Api\\Model\\ExecIdJsonGetResponse200' => 'Docker\\Api\\Normalizer\\ExecIdJsonGetResponse200Normalizer', 'Docker\\Api\\Model\\VolumesGetResponse200' => 'Docker\\Api\\Normalizer\\VolumesGetResponse200Normalizer', 'Docker\\Api\\Model\\VolumesCreatePostBody' => 'Docker\\Api\\Normalizer\\VolumesCreatePostBodyNormalizer', 'Docker\\Api\\Model\\VolumesPrunePostResponse200' => 'Docker\\Api\\Normalizer\\VolumesPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\NetworksCreatePostBody' => 'Docker\\Api\\Normalizer\\NetworksCreatePostBodyNormalizer', 'Docker\\Api\\Model\\NetworksCreatePostResponse201' => 'Docker\\Api\\Normalizer\\NetworksCreatePostResponse201Normalizer', 'Docker\\Api\\Model\\NetworksIdConnectPostBody' => 'Docker\\Api\\Normalizer\\NetworksIdConnectPostBodyNormalizer', 'Docker\\Api\\Model\\NetworksIdDisconnectPostBody' => 'Docker\\Api\\Normalizer\\NetworksIdDisconnectPostBodyNormalizer', 'Docker\\Api\\Model\\NetworksPrunePostResponse200' => 'Docker\\Api\\Normalizer\\NetworksPrunePostResponse200Normalizer', 'Docker\\Api\\Model\\PluginsPrivilegesGetResponse200Item' => 'Docker\\Api\\Normalizer\\PluginsPrivilegesGetResponse200ItemNormalizer', 'Docker\\Api\\Model\\PluginsPullPostBodyItem' => 'Docker\\Api\\Normalizer\\PluginsPullPostBodyItemNormalizer', 'Docker\\Api\\Model\\PluginsNameUpgradePostBodyItem' => 'Docker\\Api\\Normalizer\\PluginsNameUpgradePostBodyItemNormalizer', 'Docker\\Api\\Model\\SwarmInitPostBody' => 'Docker\\Api\\Normalizer\\SwarmInitPostBodyNormalizer', 'Docker\\Api\\Model\\SwarmJoinPostBody' => 'Docker\\Api\\Normalizer\\SwarmJoinPostBodyNormalizer', 'Docker\\Api\\Model\\SwarmUnlockkeyGetResponse200' => 'Docker\\Api\\Normalizer\\SwarmUnlockkeyGetResponse200Normalizer', 'Docker\\Api\\Model\\SwarmUnlockPostBody' => 'Docker\\Api\\Normalizer\\SwarmUnlockPostBodyNormalizer', 'Docker\\Api\\Model\\ServicesCreatePostBody' => 'Docker\\Api\\Normalizer\\ServicesCreatePostBodyNormalizer', 'Docker\\Api\\Model\\ServicesCreatePostResponse201' => 'Docker\\Api\\Normalizer\\ServicesCreatePostResponse201Normalizer', 'Docker\\Api\\Model\\ServicesIdUpdatePostBody' => 'Docker\\Api\\Normalizer\\ServicesIdUpdatePostBodyNormalizer', 'Docker\\Api\\Model\\SecretsCreatePostBody' => 'Docker\\Api\\Normalizer\\SecretsCreatePostBodyNormalizer', 'Docker\\Api\\Model\\ConfigsCreatePostBody' => 'Docker\\Api\\Normalizer\\ConfigsCreatePostBodyNormalizer', 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200' => 'Docker\\Api\\Normalizer\\DistributionNameJsonGetResponse200Normalizer', 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200Descriptor' => 'Docker\\Api\\Normalizer\\DistributionNameJsonGetResponse200DescriptorNormalizer', 'Docker\\Api\\Model\\DistributionNameJsonGetResponse200PlatformsItem' => 'Docker\\Api\\Normalizer\\DistributionNameJsonGetResponse200PlatformsItemNormalizer', '\\Jane\\Component\\JsonSchemaRuntime\\Reference' => '\\Docker\\Api\\Runtime\\Normalizer\\ReferenceNormalizer'), $normalizersCache = array();
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return array_key_exists($type, $this->normalizers);
     }
+    /**
+     * @return bool
+     */
     public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && array_key_exists(get_class($data), $this->normalizers);
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $normalizerClass = $this->normalizers[get_class($object)];
         $normalizer = $this->getNormalizer($normalizerClass);
         return $normalizer->normalize($object, $format, $context);
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         $denormalizerClass = $this->normalizers[$class];
diff --git a/src/Normalizer/JoinTokensNormalizer.php b/src/Normalizer/JoinTokensNormalizer.php
index 5884b47..25d83a9 100644
--- a/src/Normalizer/JoinTokensNormalizer.php
+++ b/src/Normalizer/JoinTokensNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class JoinTokensNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\JoinTokens';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\JoinTokens';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\JoinTokens();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Worker', $data) && $data['Worker'] !== null) {
             $object->setWorker($data['Worker']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ManagerStatusNormalizer.php b/src/Normalizer/ManagerStatusNormalizer.php
index b9b5caa..71d1005 100644
--- a/src/Normalizer/ManagerStatusNormalizer.php
+++ b/src/Normalizer/ManagerStatusNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ManagerStatusNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ManagerStatus';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ManagerStatus';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ManagerStatus();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Leader', $data) && $data['Leader'] !== null) {
             $object->setLeader($data['Leader']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/MountBindOptionsNormalizer.php b/src/Normalizer/MountBindOptionsNormalizer.php
index 17915bc..46489e9 100644
--- a/src/Normalizer/MountBindOptionsNormalizer.php
+++ b/src/Normalizer/MountBindOptionsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class MountBindOptionsNormalizer implements DenormalizerInterface, NormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\MountBindOptions';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\MountBindOptions';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\MountBindOptions();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Propagation', $data) && $data['Propagation'] !== null) {
             $object->setPropagation($data['Propagation']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/MountNormalizer.php b/src/Normalizer/MountNormalizer.php
index e74b4a5..e47cfd9 100644
--- a/src/Normalizer/MountNormalizer.php
+++ b/src/Normalizer/MountNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class MountNormalizer implements DenormalizerInterface, NormalizerInterface, Den
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Mount';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Mount';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Mount();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Target', $data) && $data['Target'] !== null) {
             $object->setTarget($data['Target']);
         }
@@ -83,6 +92,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/MountPointNormalizer.php b/src/Normalizer/MountPointNormalizer.php
index 5a64256..ca43482 100644
--- a/src/Normalizer/MountPointNormalizer.php
+++ b/src/Normalizer/MountPointNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class MountPointNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\MountPoint';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\MountPoint';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\MountPoint();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Type', $data) && $data['Type'] !== null) {
             $object->setType($data['Type']);
         }
@@ -83,6 +92,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/MountTmpfsOptionsNormalizer.php b/src/Normalizer/MountTmpfsOptionsNormalizer.php
index b715ad9..0e577d4 100644
--- a/src/Normalizer/MountTmpfsOptionsNormalizer.php
+++ b/src/Normalizer/MountTmpfsOptionsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class MountTmpfsOptionsNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\MountTmpfsOptions';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\MountTmpfsOptions';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\MountTmpfsOptions();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('SizeBytes', $data) && $data['SizeBytes'] !== null) {
             $object->setSizeBytes($data['SizeBytes']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/MountVolumeOptionsDriverConfigNormalizer.php b/src/Normalizer/MountVolumeOptionsDriverConfigNormalizer.php
index 42c562b..24df747 100644
--- a/src/Normalizer/MountVolumeOptionsDriverConfigNormalizer.php
+++ b/src/Normalizer/MountVolumeOptionsDriverConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class MountVolumeOptionsDriverConfigNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\MountVolumeOptionsDriverConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\MountVolumeOptionsDriverConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\MountVolumeOptionsDriverConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/MountVolumeOptionsNormalizer.php b/src/Normalizer/MountVolumeOptionsNormalizer.php
index 205d2ee..6ff6a7b 100644
--- a/src/Normalizer/MountVolumeOptionsNormalizer.php
+++ b/src/Normalizer/MountVolumeOptionsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class MountVolumeOptionsNormalizer implements DenormalizerInterface, NormalizerI
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\MountVolumeOptions';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\MountVolumeOptions';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\MountVolumeOptions();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NoCopy', $data) && $data['NoCopy'] !== null) {
             $object->setNoCopy($data['NoCopy']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworkAttachmentConfigNormalizer.php b/src/Normalizer/NetworkAttachmentConfigNormalizer.php
index fbe4e33..3912e09 100644
--- a/src/Normalizer/NetworkAttachmentConfigNormalizer.php
+++ b/src/Normalizer/NetworkAttachmentConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworkAttachmentConfigNormalizer implements DenormalizerInterface, Normal
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworkAttachmentConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworkAttachmentConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworkAttachmentConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Target', $data) && $data['Target'] !== null) {
             $object->setTarget($data['Target']);
         }
@@ -61,6 +70,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworkContainerNormalizer.php b/src/Normalizer/NetworkContainerNormalizer.php
index d956f65..8da81ca 100644
--- a/src/Normalizer/NetworkContainerNormalizer.php
+++ b/src/Normalizer/NetworkContainerNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworkContainerNormalizer implements DenormalizerInterface, NormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworkContainer';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworkContainer';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworkContainer();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworkNormalizer.php b/src/Normalizer/NetworkNormalizer.php
index 1ea8b12..c17014d 100644
--- a/src/Normalizer/NetworkNormalizer.php
+++ b/src/Normalizer/NetworkNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworkNormalizer implements DenormalizerInterface, NormalizerInterface, D
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Network';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Network';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Network();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -125,6 +134,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworkSettingsNormalizer.php b/src/Normalizer/NetworkSettingsNormalizer.php
index 8d32191..4ceba1c 100644
--- a/src/Normalizer/NetworkSettingsNormalizer.php
+++ b/src/Normalizer/NetworkSettingsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworkSettingsNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworkSettings';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworkSettings';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworkSettings();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Bridge', $data) && $data['Bridge'] !== null) {
             $object->setBridge($data['Bridge']);
         }
@@ -163,6 +172,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworkingConfigNormalizer.php b/src/Normalizer/NetworkingConfigNormalizer.php
index 91b34c4..b221053 100644
--- a/src/Normalizer/NetworkingConfigNormalizer.php
+++ b/src/Normalizer/NetworkingConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworkingConfigNormalizer implements DenormalizerInterface, NormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworkingConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworkingConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworkingConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('EndpointsConfig', $data) && $data['EndpointsConfig'] !== null) {
             $values = new \ArrayObject(array(), \ArrayObject::ARRAY_AS_PROPS);
             foreach ($data['EndpointsConfig'] as $key => $value) {
@@ -45,6 +54,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworksCreatePostBodyNormalizer.php b/src/Normalizer/NetworksCreatePostBodyNormalizer.php
index 5777ec9..098ae20 100644
--- a/src/Normalizer/NetworksCreatePostBodyNormalizer.php
+++ b/src/Normalizer/NetworksCreatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworksCreatePostBodyNormalizer implements DenormalizerInterface, Normali
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworksCreatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworksCreatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworksCreatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -103,12 +112,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
+        $data['Name'] = $object->getName();
         if (null !== $object->getCheckDuplicate()) {
             $data['CheckDuplicate'] = $object->getCheckDuplicate();
         }
diff --git a/src/Normalizer/NetworksCreatePostResponse201Normalizer.php b/src/Normalizer/NetworksCreatePostResponse201Normalizer.php
index a8938e1..b8aa424 100644
--- a/src/Normalizer/NetworksCreatePostResponse201Normalizer.php
+++ b/src/Normalizer/NetworksCreatePostResponse201Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworksCreatePostResponse201Normalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworksCreatePostResponse201';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworksCreatePostResponse201';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworksCreatePostResponse201();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworksIdConnectPostBodyNormalizer.php b/src/Normalizer/NetworksIdConnectPostBodyNormalizer.php
index c8e93bb..120fddf 100644
--- a/src/Normalizer/NetworksIdConnectPostBodyNormalizer.php
+++ b/src/Normalizer/NetworksIdConnectPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworksIdConnectPostBodyNormalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworksIdConnectPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworksIdConnectPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworksIdConnectPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Container', $data) && $data['Container'] !== null) {
             $object->setContainer($data['Container']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworksIdDisconnectPostBodyNormalizer.php b/src/Normalizer/NetworksIdDisconnectPostBodyNormalizer.php
index 27e4d69..0ce5006 100644
--- a/src/Normalizer/NetworksIdDisconnectPostBodyNormalizer.php
+++ b/src/Normalizer/NetworksIdDisconnectPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworksIdDisconnectPostBodyNormalizer implements DenormalizerInterface, N
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworksIdDisconnectPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworksIdDisconnectPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworksIdDisconnectPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Container', $data) && $data['Container'] !== null) {
             $object->setContainer($data['Container']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NetworksPrunePostResponse200Normalizer.php b/src/Normalizer/NetworksPrunePostResponse200Normalizer.php
index 192ac38..6a3cdff 100644
--- a/src/Normalizer/NetworksPrunePostResponse200Normalizer.php
+++ b/src/Normalizer/NetworksPrunePostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NetworksPrunePostResponse200Normalizer implements DenormalizerInterface, N
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NetworksPrunePostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NetworksPrunePostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NetworksPrunePostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NetworksDeleted', $data) && $data['NetworksDeleted'] !== null) {
             $values = array();
             foreach ($data['NetworksDeleted'] as $value) {
@@ -45,6 +54,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NodeDescriptionNormalizer.php b/src/Normalizer/NodeDescriptionNormalizer.php
index 4822615..66061b5 100644
--- a/src/Normalizer/NodeDescriptionNormalizer.php
+++ b/src/Normalizer/NodeDescriptionNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NodeDescriptionNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NodeDescription';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NodeDescription';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NodeDescription();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Hostname', $data) && $data['Hostname'] !== null) {
             $object->setHostname($data['Hostname']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NodeNormalizer.php b/src/Normalizer/NodeNormalizer.php
index 3809164..8461d58 100644
--- a/src/Normalizer/NodeNormalizer.php
+++ b/src/Normalizer/NodeNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NodeNormalizer implements DenormalizerInterface, NormalizerInterface, Deno
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Node';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Node';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Node();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -83,6 +92,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NodeSpecNormalizer.php b/src/Normalizer/NodeSpecNormalizer.php
index 9fbef90..07ad2f5 100644
--- a/src/Normalizer/NodeSpecNormalizer.php
+++ b/src/Normalizer/NodeSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NodeSpecNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NodeSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NodeSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NodeSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/NodeStatusNormalizer.php b/src/Normalizer/NodeStatusNormalizer.php
index 8921358..a68bbd9 100644
--- a/src/Normalizer/NodeStatusNormalizer.php
+++ b/src/Normalizer/NodeStatusNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class NodeStatusNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\NodeStatus';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\NodeStatus';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\NodeStatus();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('State', $data) && $data['State'] !== null) {
             $object->setState($data['State']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ObjectVersionNormalizer.php b/src/Normalizer/ObjectVersionNormalizer.php
index 264b43e..fcb90e9 100644
--- a/src/Normalizer/ObjectVersionNormalizer.php
+++ b/src/Normalizer/ObjectVersionNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ObjectVersionNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ObjectVersion';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ObjectVersion';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ObjectVersion();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Index', $data) && $data['Index'] !== null) {
             $object->setIndex($data['Index']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PeerNodeNormalizer.php b/src/Normalizer/PeerNodeNormalizer.php
index b93807f..2c5a306 100644
--- a/src/Normalizer/PeerNodeNormalizer.php
+++ b/src/Normalizer/PeerNodeNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PeerNodeNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PeerNode';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PeerNode';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PeerNode();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NodeID', $data) && $data['NodeID'] !== null) {
             $object->setNodeID($data['NodeID']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PlatformNormalizer.php b/src/Normalizer/PlatformNormalizer.php
index 7630e21..1963546 100644
--- a/src/Normalizer/PlatformNormalizer.php
+++ b/src/Normalizer/PlatformNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PlatformNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Platform';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Platform';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Platform();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Architecture', $data) && $data['Architecture'] !== null) {
             $object->setArchitecture($data['Architecture']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PluginConfigArgsNormalizer.php b/src/Normalizer/PluginConfigArgsNormalizer.php
index 3febcb5..5742577 100644
--- a/src/Normalizer/PluginConfigArgsNormalizer.php
+++ b/src/Normalizer/PluginConfigArgsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigArgsNormalizer implements DenormalizerInterface, NormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfigArgs';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfigArgs';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfigArgs();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -67,29 +76,24 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getDescription()) {
-            $data['Description'] = $object->getDescription();
+        $data['Name'] = $object->getName();
+        $data['Description'] = $object->getDescription();
+        $values = array();
+        foreach ($object->getSettable() as $value) {
+            $values[] = $value;
         }
-        if (null !== $object->getSettable()) {
-            $values = array();
-            foreach ($object->getSettable() as $value) {
-                $values[] = $value;
-            }
-            $data['Settable'] = $values;
-        }
-        if (null !== $object->getValue()) {
-            $values_1 = array();
-            foreach ($object->getValue() as $value_1) {
-                $values_1[] = $value_1;
-            }
-            $data['Value'] = $values_1;
+        $data['Settable'] = $values;
+        $values_1 = array();
+        foreach ($object->getValue() as $value_1) {
+            $values_1[] = $value_1;
         }
+        $data['Value'] = $values_1;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginConfigInterfaceNormalizer.php b/src/Normalizer/PluginConfigInterfaceNormalizer.php
index 3f3363b..718285e 100644
--- a/src/Normalizer/PluginConfigInterfaceNormalizer.php
+++ b/src/Normalizer/PluginConfigInterfaceNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigInterfaceNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfigInterface';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfigInterface';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfigInterface();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Types', $data) && $data['Types'] !== null) {
             $values = array();
             foreach ($data['Types'] as $value) {
@@ -57,19 +66,18 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getTypes()) {
-            $values = array();
-            foreach ($object->getTypes() as $value) {
-                $values[] = $this->normalizer->normalize($value, 'json', $context);
-            }
-            $data['Types'] = $values;
-        }
-        if (null !== $object->getSocket()) {
-            $data['Socket'] = $object->getSocket();
+        $values = array();
+        foreach ($object->getTypes() as $value) {
+            $values[] = $this->normalizer->normalize($value, 'json', $context);
         }
+        $data['Types'] = $values;
+        $data['Socket'] = $object->getSocket();
         if (null !== $object->getProtocolScheme()) {
             $data['ProtocolScheme'] = $object->getProtocolScheme();
         }
diff --git a/src/Normalizer/PluginConfigLinuxNormalizer.php b/src/Normalizer/PluginConfigLinuxNormalizer.php
index 746c61f..377e3a1 100644
--- a/src/Normalizer/PluginConfigLinuxNormalizer.php
+++ b/src/Normalizer/PluginConfigLinuxNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigLinuxNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfigLinux';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfigLinux';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfigLinux();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Capabilities', $data) && $data['Capabilities'] !== null) {
             $values = array();
             foreach ($data['Capabilities'] as $value) {
@@ -61,26 +70,23 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getCapabilities()) {
-            $values = array();
-            foreach ($object->getCapabilities() as $value) {
-                $values[] = $value;
-            }
-            $data['Capabilities'] = $values;
+        $values = array();
+        foreach ($object->getCapabilities() as $value) {
+            $values[] = $value;
         }
-        if (null !== $object->getAllowAllDevices()) {
-            $data['AllowAllDevices'] = $object->getAllowAllDevices();
-        }
-        if (null !== $object->getDevices()) {
-            $values_1 = array();
-            foreach ($object->getDevices() as $value_1) {
-                $values_1[] = $this->normalizer->normalize($value_1, 'json', $context);
-            }
-            $data['Devices'] = $values_1;
+        $data['Capabilities'] = $values;
+        $data['AllowAllDevices'] = $object->getAllowAllDevices();
+        $values_1 = array();
+        foreach ($object->getDevices() as $value_1) {
+            $values_1[] = $this->normalizer->normalize($value_1, 'json', $context);
         }
+        $data['Devices'] = $values_1;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginConfigNetworkNormalizer.php b/src/Normalizer/PluginConfigNetworkNormalizer.php
index e52117c..9e0b1b2 100644
--- a/src/Normalizer/PluginConfigNetworkNormalizer.php
+++ b/src/Normalizer/PluginConfigNetworkNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigNetworkNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfigNetwork';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfigNetwork';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfigNetwork();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Type', $data) && $data['Type'] !== null) {
             $object->setType($data['Type']);
         }
@@ -41,12 +50,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getType()) {
-            $data['Type'] = $object->getType();
-        }
+        $data['Type'] = $object->getType();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginConfigNormalizer.php b/src/Normalizer/PluginConfigNormalizer.php
index 88e6f45..cb71aca 100644
--- a/src/Normalizer/PluginConfigNormalizer.php
+++ b/src/Normalizer/PluginConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigNormalizer implements DenormalizerInterface, NormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('DockerVersion', $data) && $data['DockerVersion'] !== null) {
             $object->setDockerVersion($data['DockerVersion']);
         }
@@ -143,66 +152,43 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
         if (null !== $object->getDockerVersion()) {
             $data['DockerVersion'] = $object->getDockerVersion();
         }
-        if (null !== $object->getDescription()) {
-            $data['Description'] = $object->getDescription();
-        }
-        if (null !== $object->getDocumentation()) {
-            $data['Documentation'] = $object->getDocumentation();
-        }
-        if (null !== $object->getInterface()) {
-            $data['Interface'] = $this->normalizer->normalize($object->getInterface(), 'json', $context);
-        }
-        if (null !== $object->getEntrypoint()) {
-            $values = array();
-            foreach ($object->getEntrypoint() as $value) {
-                $values[] = $value;
-            }
-            $data['Entrypoint'] = $values;
-        }
-        if (null !== $object->getWorkDir()) {
-            $data['WorkDir'] = $object->getWorkDir();
+        $data['Description'] = $object->getDescription();
+        $data['Documentation'] = $object->getDocumentation();
+        $data['Interface'] = $this->normalizer->normalize($object->getInterface(), 'json', $context);
+        $values = array();
+        foreach ($object->getEntrypoint() as $value) {
+            $values[] = $value;
         }
+        $data['Entrypoint'] = $values;
+        $data['WorkDir'] = $object->getWorkDir();
         if (null !== $object->getUser()) {
             $data['User'] = $this->normalizer->normalize($object->getUser(), 'json', $context);
         }
-        if (null !== $object->getNetwork()) {
-            $data['Network'] = $this->normalizer->normalize($object->getNetwork(), 'json', $context);
-        }
-        if (null !== $object->getLinux()) {
-            $data['Linux'] = $this->normalizer->normalize($object->getLinux(), 'json', $context);
-        }
-        if (null !== $object->getPropagatedMount()) {
-            $data['PropagatedMount'] = $object->getPropagatedMount();
-        }
-        if (null !== $object->getIpcHost()) {
-            $data['IpcHost'] = $object->getIpcHost();
-        }
-        if (null !== $object->getPidHost()) {
-            $data['PidHost'] = $object->getPidHost();
-        }
-        if (null !== $object->getMounts()) {
-            $values_1 = array();
-            foreach ($object->getMounts() as $value_1) {
-                $values_1[] = $this->normalizer->normalize($value_1, 'json', $context);
-            }
-            $data['Mounts'] = $values_1;
-        }
-        if (null !== $object->getEnv()) {
-            $values_2 = array();
-            foreach ($object->getEnv() as $value_2) {
-                $values_2[] = $this->normalizer->normalize($value_2, 'json', $context);
-            }
-            $data['Env'] = $values_2;
-        }
-        if (null !== $object->getArgs()) {
-            $data['Args'] = $this->normalizer->normalize($object->getArgs(), 'json', $context);
-        }
+        $data['Network'] = $this->normalizer->normalize($object->getNetwork(), 'json', $context);
+        $data['Linux'] = $this->normalizer->normalize($object->getLinux(), 'json', $context);
+        $data['PropagatedMount'] = $object->getPropagatedMount();
+        $data['IpcHost'] = $object->getIpcHost();
+        $data['PidHost'] = $object->getPidHost();
+        $values_1 = array();
+        foreach ($object->getMounts() as $value_1) {
+            $values_1[] = $this->normalizer->normalize($value_1, 'json', $context);
+        }
+        $data['Mounts'] = $values_1;
+        $values_2 = array();
+        foreach ($object->getEnv() as $value_2) {
+            $values_2[] = $this->normalizer->normalize($value_2, 'json', $context);
+        }
+        $data['Env'] = $values_2;
+        $data['Args'] = $this->normalizer->normalize($object->getArgs(), 'json', $context);
         if (null !== $object->getRootfs()) {
             $data['rootfs'] = $this->normalizer->normalize($object->getRootfs(), 'json', $context);
         }
diff --git a/src/Normalizer/PluginConfigRootfsNormalizer.php b/src/Normalizer/PluginConfigRootfsNormalizer.php
index 54fe79e..7da0f9c 100644
--- a/src/Normalizer/PluginConfigRootfsNormalizer.php
+++ b/src/Normalizer/PluginConfigRootfsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigRootfsNormalizer implements DenormalizerInterface, NormalizerI
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfigRootfs';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfigRootfs';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfigRootfs();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('type', $data) && $data['type'] !== null) {
             $object->setType($data['type']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PluginConfigUserNormalizer.php b/src/Normalizer/PluginConfigUserNormalizer.php
index 1dbf164..f099161 100644
--- a/src/Normalizer/PluginConfigUserNormalizer.php
+++ b/src/Normalizer/PluginConfigUserNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginConfigUserNormalizer implements DenormalizerInterface, NormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginConfigUser';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginConfigUser';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginConfigUser();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('UID', $data) && $data['UID'] !== null) {
             $object->setUID($data['UID']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PluginDeviceNormalizer.php b/src/Normalizer/PluginDeviceNormalizer.php
index f34bff5..eb66d56 100644
--- a/src/Normalizer/PluginDeviceNormalizer.php
+++ b/src/Normalizer/PluginDeviceNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginDeviceNormalizer implements DenormalizerInterface, NormalizerInterfa
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginDevice';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginDevice';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginDevice();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,25 +72,20 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getDescription()) {
-            $data['Description'] = $object->getDescription();
-        }
-        if (null !== $object->getSettable()) {
-            $values = array();
-            foreach ($object->getSettable() as $value) {
-                $values[] = $value;
-            }
-            $data['Settable'] = $values;
-        }
-        if (null !== $object->getPath()) {
-            $data['Path'] = $object->getPath();
+        $data['Name'] = $object->getName();
+        $data['Description'] = $object->getDescription();
+        $values = array();
+        foreach ($object->getSettable() as $value) {
+            $values[] = $value;
         }
+        $data['Settable'] = $values;
+        $data['Path'] = $object->getPath();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginEnvNormalizer.php b/src/Normalizer/PluginEnvNormalizer.php
index ab16f8a..5674ff3 100644
--- a/src/Normalizer/PluginEnvNormalizer.php
+++ b/src/Normalizer/PluginEnvNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginEnvNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginEnv';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginEnv';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginEnv();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,25 +72,20 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getDescription()) {
-            $data['Description'] = $object->getDescription();
-        }
-        if (null !== $object->getSettable()) {
-            $values = array();
-            foreach ($object->getSettable() as $value) {
-                $values[] = $value;
-            }
-            $data['Settable'] = $values;
-        }
-        if (null !== $object->getValue()) {
-            $data['Value'] = $object->getValue();
+        $data['Name'] = $object->getName();
+        $data['Description'] = $object->getDescription();
+        $values = array();
+        foreach ($object->getSettable() as $value) {
+            $values[] = $value;
         }
+        $data['Settable'] = $values;
+        $data['Value'] = $object->getValue();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginInterfaceTypeNormalizer.php b/src/Normalizer/PluginInterfaceTypeNormalizer.php
index 3e07d08..a9ac603 100644
--- a/src/Normalizer/PluginInterfaceTypeNormalizer.php
+++ b/src/Normalizer/PluginInterfaceTypeNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginInterfaceTypeNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginInterfaceType';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginInterfaceType';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginInterfaceType();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Prefix', $data) && $data['Prefix'] !== null) {
             $object->setPrefix($data['Prefix']);
         }
@@ -53,18 +62,15 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getPrefix()) {
-            $data['Prefix'] = $object->getPrefix();
-        }
-        if (null !== $object->getCapability()) {
-            $data['Capability'] = $object->getCapability();
-        }
-        if (null !== $object->getVersion()) {
-            $data['Version'] = $object->getVersion();
-        }
+        $data['Prefix'] = $object->getPrefix();
+        $data['Capability'] = $object->getCapability();
+        $data['Version'] = $object->getVersion();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginMountNormalizer.php b/src/Normalizer/PluginMountNormalizer.php
index 7c9b011..c7bb6ad 100644
--- a/src/Normalizer/PluginMountNormalizer.php
+++ b/src/Normalizer/PluginMountNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginMountNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginMount';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginMount';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginMount();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -85,38 +94,27 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getDescription()) {
-            $data['Description'] = $object->getDescription();
-        }
-        if (null !== $object->getSettable()) {
-            $values = array();
-            foreach ($object->getSettable() as $value) {
-                $values[] = $value;
-            }
-            $data['Settable'] = $values;
-        }
-        if (null !== $object->getSource()) {
-            $data['Source'] = $object->getSource();
-        }
-        if (null !== $object->getDestination()) {
-            $data['Destination'] = $object->getDestination();
-        }
-        if (null !== $object->getType()) {
-            $data['Type'] = $object->getType();
-        }
-        if (null !== $object->getOptions()) {
-            $values_1 = array();
-            foreach ($object->getOptions() as $value_1) {
-                $values_1[] = $value_1;
-            }
-            $data['Options'] = $values_1;
-        }
+        $data['Name'] = $object->getName();
+        $data['Description'] = $object->getDescription();
+        $values = array();
+        foreach ($object->getSettable() as $value) {
+            $values[] = $value;
+        }
+        $data['Settable'] = $values;
+        $data['Source'] = $object->getSource();
+        $data['Destination'] = $object->getDestination();
+        $data['Type'] = $object->getType();
+        $values_1 = array();
+        foreach ($object->getOptions() as $value_1) {
+            $values_1[] = $value_1;
+        }
+        $data['Options'] = $values_1;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginNormalizer.php b/src/Normalizer/PluginNormalizer.php
index 8c45f21..ce08c69 100644
--- a/src/Normalizer/PluginNormalizer.php
+++ b/src/Normalizer/PluginNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Plugin';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Plugin';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Plugin();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Id', $data) && $data['Id'] !== null) {
             $object->setId($data['Id']);
         }
@@ -71,27 +80,22 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
         if (null !== $object->getId()) {
             $data['Id'] = $object->getId();
         }
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getEnabled()) {
-            $data['Enabled'] = $object->getEnabled();
-        }
-        if (null !== $object->getSettings()) {
-            $data['Settings'] = $this->normalizer->normalize($object->getSettings(), 'json', $context);
-        }
+        $data['Name'] = $object->getName();
+        $data['Enabled'] = $object->getEnabled();
+        $data['Settings'] = $this->normalizer->normalize($object->getSettings(), 'json', $context);
         if (null !== $object->getPluginReference()) {
             $data['PluginReference'] = $object->getPluginReference();
         }
-        if (null !== $object->getConfig()) {
-            $data['Config'] = $this->normalizer->normalize($object->getConfig(), 'json', $context);
-        }
+        $data['Config'] = $this->normalizer->normalize($object->getConfig(), 'json', $context);
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginSettingsNormalizer.php b/src/Normalizer/PluginSettingsNormalizer.php
index 2aa625d..2a2b372 100644
--- a/src/Normalizer/PluginSettingsNormalizer.php
+++ b/src/Normalizer/PluginSettingsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginSettingsNormalizer implements DenormalizerInterface, NormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginSettings';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginSettings';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginSettings();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Mounts', $data) && $data['Mounts'] !== null) {
             $values = array();
             foreach ($data['Mounts'] as $value) {
@@ -75,37 +84,32 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getMounts()) {
-            $values = array();
-            foreach ($object->getMounts() as $value) {
-                $values[] = $this->normalizer->normalize($value, 'json', $context);
-            }
-            $data['Mounts'] = $values;
+        $values = array();
+        foreach ($object->getMounts() as $value) {
+            $values[] = $this->normalizer->normalize($value, 'json', $context);
         }
-        if (null !== $object->getEnv()) {
-            $values_1 = array();
-            foreach ($object->getEnv() as $value_1) {
-                $values_1[] = $value_1;
-            }
-            $data['Env'] = $values_1;
+        $data['Mounts'] = $values;
+        $values_1 = array();
+        foreach ($object->getEnv() as $value_1) {
+            $values_1[] = $value_1;
         }
-        if (null !== $object->getArgs()) {
-            $values_2 = array();
-            foreach ($object->getArgs() as $value_2) {
-                $values_2[] = $value_2;
-            }
-            $data['Args'] = $values_2;
+        $data['Env'] = $values_1;
+        $values_2 = array();
+        foreach ($object->getArgs() as $value_2) {
+            $values_2[] = $value_2;
         }
-        if (null !== $object->getDevices()) {
-            $values_3 = array();
-            foreach ($object->getDevices() as $value_3) {
-                $values_3[] = $this->normalizer->normalize($value_3, 'json', $context);
-            }
-            $data['Devices'] = $values_3;
+        $data['Args'] = $values_2;
+        $values_3 = array();
+        foreach ($object->getDevices() as $value_3) {
+            $values_3[] = $this->normalizer->normalize($value_3, 'json', $context);
         }
+        $data['Devices'] = $values_3;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/PluginsInfoNormalizer.php b/src/Normalizer/PluginsInfoNormalizer.php
index 1f9977d..2e63b96 100644
--- a/src/Normalizer/PluginsInfoNormalizer.php
+++ b/src/Normalizer/PluginsInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginsInfoNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginsInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginsInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginsInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Volume', $data) && $data['Volume'] !== null) {
             $values = array();
             foreach ($data['Volume'] as $value) {
@@ -75,6 +84,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PluginsNameUpgradePostBodyItemNormalizer.php b/src/Normalizer/PluginsNameUpgradePostBodyItemNormalizer.php
index c0f3217..0a17401 100644
--- a/src/Normalizer/PluginsNameUpgradePostBodyItemNormalizer.php
+++ b/src/Normalizer/PluginsNameUpgradePostBodyItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginsNameUpgradePostBodyItemNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginsNameUpgradePostBodyItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginsNameUpgradePostBodyItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginsNameUpgradePostBodyItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PluginsPrivilegesGetResponse200ItemNormalizer.php b/src/Normalizer/PluginsPrivilegesGetResponse200ItemNormalizer.php
index 6f57a8b..4bd440d 100644
--- a/src/Normalizer/PluginsPrivilegesGetResponse200ItemNormalizer.php
+++ b/src/Normalizer/PluginsPrivilegesGetResponse200ItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginsPrivilegesGetResponse200ItemNormalizer implements DenormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginsPrivilegesGetResponse200Item';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginsPrivilegesGetResponse200Item';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginsPrivilegesGetResponse200Item();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PluginsPullPostBodyItemNormalizer.php b/src/Normalizer/PluginsPullPostBodyItemNormalizer.php
index 67561b9..68f34f9 100644
--- a/src/Normalizer/PluginsPullPostBodyItemNormalizer.php
+++ b/src/Normalizer/PluginsPullPostBodyItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PluginsPullPostBodyItemNormalizer implements DenormalizerInterface, Normal
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PluginsPullPostBodyItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PluginsPullPostBodyItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PluginsPullPostBodyItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PortBindingNormalizer.php b/src/Normalizer/PortBindingNormalizer.php
index 248b08f..4a62bc2 100644
--- a/src/Normalizer/PortBindingNormalizer.php
+++ b/src/Normalizer/PortBindingNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PortBindingNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PortBinding';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PortBinding';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PortBinding();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('HostIp', $data) && $data['HostIp'] !== null) {
             $object->setHostIp($data['HostIp']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PortNormalizer.php b/src/Normalizer/PortNormalizer.php
index 9f5ee9d..8effa09 100644
--- a/src/Normalizer/PortNormalizer.php
+++ b/src/Normalizer/PortNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PortNormalizer implements DenormalizerInterface, NormalizerInterface, Deno
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Port';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Port';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Port();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('IP', $data) && $data['IP'] !== null) {
             $object->setIP($data['IP']);
         }
@@ -59,21 +68,20 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
         if (null !== $object->getIP()) {
             $data['IP'] = $object->getIP();
         }
-        if (null !== $object->getPrivatePort()) {
-            $data['PrivatePort'] = $object->getPrivatePort();
-        }
+        $data['PrivatePort'] = $object->getPrivatePort();
         if (null !== $object->getPublicPort()) {
             $data['PublicPort'] = $object->getPublicPort();
         }
-        if (null !== $object->getType()) {
-            $data['Type'] = $object->getType();
-        }
+        $data['Type'] = $object->getType();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/ProcessConfigNormalizer.php b/src/Normalizer/ProcessConfigNormalizer.php
index a60dfa4..3d82049 100644
--- a/src/Normalizer/ProcessConfigNormalizer.php
+++ b/src/Normalizer/ProcessConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ProcessConfigNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ProcessConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ProcessConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ProcessConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('privileged', $data) && $data['privileged'] !== null) {
             $object->setPrivileged($data['privileged']);
         }
@@ -69,6 +78,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ProgressDetailNormalizer.php b/src/Normalizer/ProgressDetailNormalizer.php
index 39311f1..4668b90 100644
--- a/src/Normalizer/ProgressDetailNormalizer.php
+++ b/src/Normalizer/ProgressDetailNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ProgressDetailNormalizer implements DenormalizerInterface, NormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ProgressDetail';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ProgressDetail';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ProgressDetail();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('current', $data) && $data['current'] !== null) {
             $object->setCurrent($data['current']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/PushImageInfoNormalizer.php b/src/Normalizer/PushImageInfoNormalizer.php
index 2786b11..a9706f9 100644
--- a/src/Normalizer/PushImageInfoNormalizer.php
+++ b/src/Normalizer/PushImageInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class PushImageInfoNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\PushImageInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\PushImageInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\PushImageInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('error', $data) && $data['error'] !== null) {
             $object->setError($data['error']);
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/RegistryServiceConfigNormalizer.php b/src/Normalizer/RegistryServiceConfigNormalizer.php
index 09a6cf5..0ac1811 100644
--- a/src/Normalizer/RegistryServiceConfigNormalizer.php
+++ b/src/Normalizer/RegistryServiceConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class RegistryServiceConfigNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\RegistryServiceConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\RegistryServiceConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\RegistryServiceConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('AllowNondistributableArtifactsCIDRs', $data) && $data['AllowNondistributableArtifactsCIDRs'] !== null) {
             $values = array();
             foreach ($data['AllowNondistributableArtifactsCIDRs'] as $value) {
@@ -85,6 +94,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ResourceObjectNormalizer.php b/src/Normalizer/ResourceObjectNormalizer.php
index 06f5a62..e5932cd 100644
--- a/src/Normalizer/ResourceObjectNormalizer.php
+++ b/src/Normalizer/ResourceObjectNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ResourceObjectNormalizer implements DenormalizerInterface, NormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ResourceObject';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ResourceObject';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ResourceObject();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NanoCPUs', $data) && $data['NanoCPUs'] !== null) {
             $object->setNanoCPUs($data['NanoCPUs']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ResourcesBlkioWeightDeviceItemNormalizer.php b/src/Normalizer/ResourcesBlkioWeightDeviceItemNormalizer.php
index 425e13b..bf09768 100644
--- a/src/Normalizer/ResourcesBlkioWeightDeviceItemNormalizer.php
+++ b/src/Normalizer/ResourcesBlkioWeightDeviceItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ResourcesBlkioWeightDeviceItemNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ResourcesBlkioWeightDeviceItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ResourcesBlkioWeightDeviceItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ResourcesBlkioWeightDeviceItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Path', $data) && $data['Path'] !== null) {
             $object->setPath($data['Path']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ResourcesNormalizer.php b/src/Normalizer/ResourcesNormalizer.php
index 2fbc519..3ae1a83 100644
--- a/src/Normalizer/ResourcesNormalizer.php
+++ b/src/Normalizer/ResourcesNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ResourcesNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Resources';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Resources';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Resources();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('CpuShares', $data) && $data['CpuShares'] !== null) {
             $object->setCpuShares($data['CpuShares']);
         }
@@ -263,6 +272,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ResourcesUlimitsItemNormalizer.php b/src/Normalizer/ResourcesUlimitsItemNormalizer.php
index f71ee3c..2d26d1b 100644
--- a/src/Normalizer/ResourcesUlimitsItemNormalizer.php
+++ b/src/Normalizer/ResourcesUlimitsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ResourcesUlimitsItemNormalizer implements DenormalizerInterface, Normalize
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ResourcesUlimitsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ResourcesUlimitsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ResourcesUlimitsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/RestartPolicyNormalizer.php b/src/Normalizer/RestartPolicyNormalizer.php
index 273d6a0..0fccdbc 100644
--- a/src/Normalizer/RestartPolicyNormalizer.php
+++ b/src/Normalizer/RestartPolicyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class RestartPolicyNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\RestartPolicy';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\RestartPolicy';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\RestartPolicy();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/RuntimeNormalizer.php b/src/Normalizer/RuntimeNormalizer.php
index c7a36c2..5d3bc88 100644
--- a/src/Normalizer/RuntimeNormalizer.php
+++ b/src/Normalizer/RuntimeNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class RuntimeNormalizer implements DenormalizerInterface, NormalizerInterface, D
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Runtime';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Runtime';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Runtime();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('path', $data) && $data['path'] !== null) {
             $object->setPath($data['path']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SecretNormalizer.php b/src/Normalizer/SecretNormalizer.php
index 4746145..bcbd94a 100644
--- a/src/Normalizer/SecretNormalizer.php
+++ b/src/Normalizer/SecretNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SecretNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Secret';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Secret';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Secret();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SecretSpecNormalizer.php b/src/Normalizer/SecretSpecNormalizer.php
index 2d284e1..caf9db0 100644
--- a/src/Normalizer/SecretSpecNormalizer.php
+++ b/src/Normalizer/SecretSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SecretSpecNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SecretSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SecretSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SecretSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -69,6 +78,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SecretsCreatePostBodyNormalizer.php b/src/Normalizer/SecretsCreatePostBodyNormalizer.php
index b3401f4..007a3c3 100644
--- a/src/Normalizer/SecretsCreatePostBodyNormalizer.php
+++ b/src/Normalizer/SecretsCreatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SecretsCreatePostBodyNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SecretsCreatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SecretsCreatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SecretsCreatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -69,6 +78,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceEndpointNormalizer.php b/src/Normalizer/ServiceEndpointNormalizer.php
index ef87364..e02c307 100644
--- a/src/Normalizer/ServiceEndpointNormalizer.php
+++ b/src/Normalizer/ServiceEndpointNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceEndpointNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceEndpoint';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceEndpoint';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceEndpoint();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Spec', $data) && $data['Spec'] !== null) {
             $object->setSpec($this->denormalizer->denormalize($data['Spec'], 'Docker\\Api\\Model\\EndpointSpec', 'json', $context));
         }
@@ -61,6 +70,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceEndpointVirtualIPsItemNormalizer.php b/src/Normalizer/ServiceEndpointVirtualIPsItemNormalizer.php
index 36c48a9..151ed11 100644
--- a/src/Normalizer/ServiceEndpointVirtualIPsItemNormalizer.php
+++ b/src/Normalizer/ServiceEndpointVirtualIPsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceEndpointVirtualIPsItemNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceEndpointVirtualIPsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceEndpointVirtualIPsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceEndpointVirtualIPsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NetworkID', $data) && $data['NetworkID'] !== null) {
             $object->setNetworkID($data['NetworkID']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceNormalizer.php b/src/Normalizer/ServiceNormalizer.php
index 4db50a3..47270ae 100644
--- a/src/Normalizer/ServiceNormalizer.php
+++ b/src/Normalizer/ServiceNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceNormalizer implements DenormalizerInterface, NormalizerInterface, D
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Service';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Service';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Service();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -77,6 +86,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceSpecModeNormalizer.php b/src/Normalizer/ServiceSpecModeNormalizer.php
index 22ffe6f..d92364e 100644
--- a/src/Normalizer/ServiceSpecModeNormalizer.php
+++ b/src/Normalizer/ServiceSpecModeNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceSpecModeNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceSpecMode';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceSpecMode';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceSpecMode();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Replicated', $data) && $data['Replicated'] !== null) {
             $object->setReplicated($this->denormalizer->denormalize($data['Replicated'], 'Docker\\Api\\Model\\ServiceSpecModeReplicated', 'json', $context));
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceSpecModeReplicatedNormalizer.php b/src/Normalizer/ServiceSpecModeReplicatedNormalizer.php
index dedf3a5..50842d5 100644
--- a/src/Normalizer/ServiceSpecModeReplicatedNormalizer.php
+++ b/src/Normalizer/ServiceSpecModeReplicatedNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceSpecModeReplicatedNormalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceSpecModeReplicated';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceSpecModeReplicated';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceSpecModeReplicated();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Replicas', $data) && $data['Replicas'] !== null) {
             $object->setReplicas($data['Replicas']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceSpecNormalizer.php b/src/Normalizer/ServiceSpecNormalizer.php
index 021e00e..1d2c399 100644
--- a/src/Normalizer/ServiceSpecNormalizer.php
+++ b/src/Normalizer/ServiceSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceSpecNormalizer implements DenormalizerInterface, NormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -91,6 +100,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceSpecRollbackConfigNormalizer.php b/src/Normalizer/ServiceSpecRollbackConfigNormalizer.php
index 0efcadb..6ae91b8 100644
--- a/src/Normalizer/ServiceSpecRollbackConfigNormalizer.php
+++ b/src/Normalizer/ServiceSpecRollbackConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceSpecRollbackConfigNormalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceSpecRollbackConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceSpecRollbackConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceSpecRollbackConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Parallelism', $data) && $data['Parallelism'] !== null) {
             $object->setParallelism($data['Parallelism']);
         }
@@ -71,6 +80,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceSpecUpdateConfigNormalizer.php b/src/Normalizer/ServiceSpecUpdateConfigNormalizer.php
index a838bb7..5297e07 100644
--- a/src/Normalizer/ServiceSpecUpdateConfigNormalizer.php
+++ b/src/Normalizer/ServiceSpecUpdateConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceSpecUpdateConfigNormalizer implements DenormalizerInterface, Normal
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceSpecUpdateConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceSpecUpdateConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceSpecUpdateConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Parallelism', $data) && $data['Parallelism'] !== null) {
             $object->setParallelism($data['Parallelism']);
         }
@@ -71,6 +80,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceUpdateResponseNormalizer.php b/src/Normalizer/ServiceUpdateResponseNormalizer.php
index 4f87bf3..6dc05e6 100644
--- a/src/Normalizer/ServiceUpdateResponseNormalizer.php
+++ b/src/Normalizer/ServiceUpdateResponseNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceUpdateResponseNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceUpdateResponse';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceUpdateResponse';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceUpdateResponse();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Warnings', $data) && $data['Warnings'] !== null) {
             $values = array();
             foreach ($data['Warnings'] as $value) {
@@ -45,6 +54,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServiceUpdateStatusNormalizer.php b/src/Normalizer/ServiceUpdateStatusNormalizer.php
index 7ed4b0f..0152e75 100644
--- a/src/Normalizer/ServiceUpdateStatusNormalizer.php
+++ b/src/Normalizer/ServiceUpdateStatusNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServiceUpdateStatusNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServiceUpdateStatus';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServiceUpdateStatus';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServiceUpdateStatus();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('State', $data) && $data['State'] !== null) {
             $object->setState($data['State']);
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServicesCreatePostBodyNormalizer.php b/src/Normalizer/ServicesCreatePostBodyNormalizer.php
index 755e5fe..51f5bc6 100644
--- a/src/Normalizer/ServicesCreatePostBodyNormalizer.php
+++ b/src/Normalizer/ServicesCreatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServicesCreatePostBodyNormalizer implements DenormalizerInterface, Normali
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServicesCreatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServicesCreatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServicesCreatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -91,6 +100,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServicesCreatePostResponse201Normalizer.php b/src/Normalizer/ServicesCreatePostResponse201Normalizer.php
index c682cd7..57a3473 100644
--- a/src/Normalizer/ServicesCreatePostResponse201Normalizer.php
+++ b/src/Normalizer/ServicesCreatePostResponse201Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServicesCreatePostResponse201Normalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServicesCreatePostResponse201';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServicesCreatePostResponse201';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServicesCreatePostResponse201();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ServicesIdUpdatePostBodyNormalizer.php b/src/Normalizer/ServicesIdUpdatePostBodyNormalizer.php
index db3a8c2..0f5420b 100644
--- a/src/Normalizer/ServicesIdUpdatePostBodyNormalizer.php
+++ b/src/Normalizer/ServicesIdUpdatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ServicesIdUpdatePostBodyNormalizer implements DenormalizerInterface, Norma
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ServicesIdUpdatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ServicesIdUpdatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ServicesIdUpdatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -91,6 +100,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmInfoNormalizer.php b/src/Normalizer/SwarmInfoNormalizer.php
index bf36461..5911301 100644
--- a/src/Normalizer/SwarmInfoNormalizer.php
+++ b/src/Normalizer/SwarmInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmInfoNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NodeID', $data) && $data['NodeID'] !== null) {
             $object->setNodeID($data['NodeID']);
         }
@@ -93,6 +102,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmInitPostBodyNormalizer.php b/src/Normalizer/SwarmInitPostBodyNormalizer.php
index 6837442..9ff788c 100644
--- a/src/Normalizer/SwarmInitPostBodyNormalizer.php
+++ b/src/Normalizer/SwarmInitPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmInitPostBodyNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmInitPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmInitPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmInitPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ListenAddr', $data) && $data['ListenAddr'] !== null) {
             $object->setListenAddr($data['ListenAddr']);
         }
@@ -87,6 +96,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmJoinPostBodyNormalizer.php b/src/Normalizer/SwarmJoinPostBodyNormalizer.php
index 46e3ac4..2afa7ea 100644
--- a/src/Normalizer/SwarmJoinPostBodyNormalizer.php
+++ b/src/Normalizer/SwarmJoinPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmJoinPostBodyNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmJoinPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmJoinPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmJoinPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ListenAddr', $data) && $data['ListenAddr'] !== null) {
             $object->setListenAddr($data['ListenAddr']);
         }
@@ -69,6 +78,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmNormalizer.php b/src/Normalizer/SwarmNormalizer.php
index 90025fb..dfb522b 100644
--- a/src/Normalizer/SwarmNormalizer.php
+++ b/src/Normalizer/SwarmNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmNormalizer implements DenormalizerInterface, NormalizerInterface, Den
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Swarm';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Swarm';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Swarm();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -105,6 +114,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecCAConfigExternalCAsItemNormalizer.php b/src/Normalizer/SwarmSpecCAConfigExternalCAsItemNormalizer.php
index c0fb4b6..dbfb682 100644
--- a/src/Normalizer/SwarmSpecCAConfigExternalCAsItemNormalizer.php
+++ b/src/Normalizer/SwarmSpecCAConfigExternalCAsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecCAConfigExternalCAsItemNormalizer implements DenormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecCAConfigExternalCAsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecCAConfigExternalCAsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecCAConfigExternalCAsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Protocol', $data) && $data['Protocol'] !== null) {
             $object->setProtocol($data['Protocol']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecCAConfigNormalizer.php b/src/Normalizer/SwarmSpecCAConfigNormalizer.php
index 2c0f057..955d51d 100644
--- a/src/Normalizer/SwarmSpecCAConfigNormalizer.php
+++ b/src/Normalizer/SwarmSpecCAConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecCAConfigNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecCAConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecCAConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecCAConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('NodeCertExpiry', $data) && $data['NodeCertExpiry'] !== null) {
             $object->setNodeCertExpiry($data['NodeCertExpiry']);
         }
@@ -69,6 +78,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecDispatcherNormalizer.php b/src/Normalizer/SwarmSpecDispatcherNormalizer.php
index 9b4b0b3..55390a4 100644
--- a/src/Normalizer/SwarmSpecDispatcherNormalizer.php
+++ b/src/Normalizer/SwarmSpecDispatcherNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecDispatcherNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecDispatcher';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecDispatcher';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecDispatcher();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('HeartbeatPeriod', $data) && $data['HeartbeatPeriod'] !== null) {
             $object->setHeartbeatPeriod($data['HeartbeatPeriod']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecEncryptionConfigNormalizer.php b/src/Normalizer/SwarmSpecEncryptionConfigNormalizer.php
index 82da2f0..2dad6ae 100644
--- a/src/Normalizer/SwarmSpecEncryptionConfigNormalizer.php
+++ b/src/Normalizer/SwarmSpecEncryptionConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecEncryptionConfigNormalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecEncryptionConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecEncryptionConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecEncryptionConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('AutoLockManagers', $data) && $data['AutoLockManagers'] !== null) {
             $object->setAutoLockManagers($data['AutoLockManagers']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecNormalizer.php b/src/Normalizer/SwarmSpecNormalizer.php
index b0a121a..cd88672 100644
--- a/src/Normalizer/SwarmSpecNormalizer.php
+++ b/src/Normalizer/SwarmSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -87,6 +96,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecOrchestrationNormalizer.php b/src/Normalizer/SwarmSpecOrchestrationNormalizer.php
index 6e4d901..ef4f49e 100644
--- a/src/Normalizer/SwarmSpecOrchestrationNormalizer.php
+++ b/src/Normalizer/SwarmSpecOrchestrationNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecOrchestrationNormalizer implements DenormalizerInterface, Normali
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecOrchestration';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecOrchestration';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecOrchestration();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('TaskHistoryRetentionLimit', $data) && $data['TaskHistoryRetentionLimit'] !== null) {
             $object->setTaskHistoryRetentionLimit($data['TaskHistoryRetentionLimit']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecRaftNormalizer.php b/src/Normalizer/SwarmSpecRaftNormalizer.php
index fc6b874..622e7f8 100644
--- a/src/Normalizer/SwarmSpecRaftNormalizer.php
+++ b/src/Normalizer/SwarmSpecRaftNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecRaftNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecRaft';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecRaft';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecRaft();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('SnapshotInterval', $data) && $data['SnapshotInterval'] !== null) {
             $object->setSnapshotInterval($data['SnapshotInterval']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecTaskDefaultsLogDriverNormalizer.php b/src/Normalizer/SwarmSpecTaskDefaultsLogDriverNormalizer.php
index 741acde..b23684d 100644
--- a/src/Normalizer/SwarmSpecTaskDefaultsLogDriverNormalizer.php
+++ b/src/Normalizer/SwarmSpecTaskDefaultsLogDriverNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecTaskDefaultsLogDriverNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecTaskDefaultsLogDriver';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecTaskDefaultsLogDriver';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecTaskDefaultsLogDriver();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmSpecTaskDefaultsNormalizer.php b/src/Normalizer/SwarmSpecTaskDefaultsNormalizer.php
index 3c962a6..726e031 100644
--- a/src/Normalizer/SwarmSpecTaskDefaultsNormalizer.php
+++ b/src/Normalizer/SwarmSpecTaskDefaultsNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmSpecTaskDefaultsNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmSpecTaskDefaults';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmSpecTaskDefaults';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmSpecTaskDefaults();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('LogDriver', $data) && $data['LogDriver'] !== null) {
             $object->setLogDriver($this->denormalizer->denormalize($data['LogDriver'], 'Docker\\Api\\Model\\SwarmSpecTaskDefaultsLogDriver', 'json', $context));
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmUnlockPostBodyNormalizer.php b/src/Normalizer/SwarmUnlockPostBodyNormalizer.php
index 80bc6ef..a678340 100644
--- a/src/Normalizer/SwarmUnlockPostBodyNormalizer.php
+++ b/src/Normalizer/SwarmUnlockPostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmUnlockPostBodyNormalizer implements DenormalizerInterface, Normalizer
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmUnlockPostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmUnlockPostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmUnlockPostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('UnlockKey', $data) && $data['UnlockKey'] !== null) {
             $object->setUnlockKey($data['UnlockKey']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SwarmUnlockkeyGetResponse200Normalizer.php b/src/Normalizer/SwarmUnlockkeyGetResponse200Normalizer.php
index 1b3cf1f..eeb63bd 100644
--- a/src/Normalizer/SwarmUnlockkeyGetResponse200Normalizer.php
+++ b/src/Normalizer/SwarmUnlockkeyGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SwarmUnlockkeyGetResponse200Normalizer implements DenormalizerInterface, N
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SwarmUnlockkeyGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SwarmUnlockkeyGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SwarmUnlockkeyGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('UnlockKey', $data) && $data['UnlockKey'] !== null) {
             $object->setUnlockKey($data['UnlockKey']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SystemDfGetResponse200Normalizer.php b/src/Normalizer/SystemDfGetResponse200Normalizer.php
index f4fb5eb..4ca47b0 100644
--- a/src/Normalizer/SystemDfGetResponse200Normalizer.php
+++ b/src/Normalizer/SystemDfGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SystemDfGetResponse200Normalizer implements DenormalizerInterface, Normali
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SystemDfGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SystemDfGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SystemDfGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('LayersSize', $data) && $data['LayersSize'] !== null) {
             $object->setLayersSize($data['LayersSize']);
         }
@@ -85,6 +94,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SystemInfoNormalizer.php b/src/Normalizer/SystemInfoNormalizer.php
index b438d5a..1176f95 100644
--- a/src/Normalizer/SystemInfoNormalizer.php
+++ b/src/Normalizer/SystemInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SystemInfoNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SystemInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SystemInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SystemInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -431,6 +440,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SystemVersionComponentsItemNormalizer.php b/src/Normalizer/SystemVersionComponentsItemNormalizer.php
index 9daed8b..3122bae 100644
--- a/src/Normalizer/SystemVersionComponentsItemNormalizer.php
+++ b/src/Normalizer/SystemVersionComponentsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SystemVersionComponentsItemNormalizer implements DenormalizerInterface, No
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SystemVersionComponentsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SystemVersionComponentsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SystemVersionComponentsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -53,15 +62,14 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getVersion()) {
-            $data['Version'] = $object->getVersion();
-        }
+        $data['Name'] = $object->getName();
+        $data['Version'] = $object->getVersion();
         if (null !== $object->getDetails()) {
             $data['Details'] = $object->getDetails();
         }
diff --git a/src/Normalizer/SystemVersionNormalizer.php b/src/Normalizer/SystemVersionNormalizer.php
index c6fd05d..e307557 100644
--- a/src/Normalizer/SystemVersionNormalizer.php
+++ b/src/Normalizer/SystemVersionNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SystemVersionNormalizer implements DenormalizerInterface, NormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SystemVersion';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SystemVersion';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SystemVersion();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Platform', $data) && $data['Platform'] !== null) {
             $object->setPlatform($this->denormalizer->denormalize($data['Platform'], 'Docker\\Api\\Model\\SystemVersionPlatform', 'json', $context));
         }
@@ -111,6 +120,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/SystemVersionPlatformNormalizer.php b/src/Normalizer/SystemVersionPlatformNormalizer.php
index 2dad3a5..cf55dd6 100644
--- a/src/Normalizer/SystemVersionPlatformNormalizer.php
+++ b/src/Normalizer/SystemVersionPlatformNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class SystemVersionPlatformNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\SystemVersionPlatform';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\SystemVersionPlatform';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\SystemVersionPlatform();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -41,12 +50,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
+        $data['Name'] = $object->getName();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/TLSInfoNormalizer.php b/src/Normalizer/TLSInfoNormalizer.php
index c9b2501..375f975 100644
--- a/src/Normalizer/TLSInfoNormalizer.php
+++ b/src/Normalizer/TLSInfoNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TLSInfoNormalizer implements DenormalizerInterface, NormalizerInterface, D
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TLSInfo';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TLSInfo';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TLSInfo();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('TrustRoot', $data) && $data['TrustRoot'] !== null) {
             $object->setTrustRoot($data['TrustRoot']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskNormalizer.php b/src/Normalizer/TaskNormalizer.php
index bee1c00..94929ac 100644
--- a/src/Normalizer/TaskNormalizer.php
+++ b/src/Normalizer/TaskNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskNormalizer implements DenormalizerInterface, NormalizerInterface, Deno
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Task';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Task';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Task();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ID', $data) && $data['ID'] !== null) {
             $object->setID($data['ID']);
         }
@@ -121,6 +130,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecConfigsItemFileNormalizer.php b/src/Normalizer/TaskSpecContainerSpecConfigsItemFileNormalizer.php
index 8aec7e6..c910210 100644
--- a/src/Normalizer/TaskSpecContainerSpecConfigsItemFileNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecConfigsItemFileNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecConfigsItemFileNormalizer implements DenormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItemFile';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItemFile';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecConfigsItemFile();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecConfigsItemNormalizer.php b/src/Normalizer/TaskSpecContainerSpecConfigsItemNormalizer.php
index 8d1b030..c9935ac 100644
--- a/src/Normalizer/TaskSpecContainerSpecConfigsItemNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecConfigsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecConfigsItemNormalizer implements DenormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecConfigsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('File', $data) && $data['File'] !== null) {
             $object->setFile($this->denormalizer->denormalize($data['File'], 'Docker\\Api\\Model\\TaskSpecContainerSpecConfigsItemFile', 'json', $context));
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecDNSConfigNormalizer.php b/src/Normalizer/TaskSpecContainerSpecDNSConfigNormalizer.php
index b74c402..51a8862 100644
--- a/src/Normalizer/TaskSpecContainerSpecDNSConfigNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecDNSConfigNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecDNSConfigNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecDNSConfig';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecDNSConfig';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecDNSConfig();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Nameservers', $data) && $data['Nameservers'] !== null) {
             $values = array();
             foreach ($data['Nameservers'] as $value) {
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecNormalizer.php b/src/Normalizer/TaskSpecContainerSpecNormalizer.php
index 9b2fe56..563688b 100644
--- a/src/Normalizer/TaskSpecContainerSpecNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Image', $data) && $data['Image'] !== null) {
             $object->setImage($data['Image']);
         }
@@ -219,6 +228,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer.php b/src/Normalizer/TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer.php
index 92e542a..d3421a3 100644
--- a/src/Normalizer/TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecPrivilegesCredentialSpecNormalizer implements Denorma
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesCredentialSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesCredentialSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecPrivilegesCredentialSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Config', $data) && $data['Config'] !== null) {
             $object->setConfig($data['Config']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecPrivilegesNormalizer.php b/src/Normalizer/TaskSpecContainerSpecPrivilegesNormalizer.php
index 962ebed..53d8a4b 100644
--- a/src/Normalizer/TaskSpecContainerSpecPrivilegesNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecPrivilegesNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecPrivilegesNormalizer implements DenormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivileges';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivileges';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecPrivileges();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('CredentialSpec', $data) && $data['CredentialSpec'] !== null) {
             $object->setCredentialSpec($this->denormalizer->denormalize($data['CredentialSpec'], 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesCredentialSpec', 'json', $context));
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer.php b/src/Normalizer/TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer.php
index abf7151..ce2ee85 100644
--- a/src/Normalizer/TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecPrivilegesSELinuxContextNormalizer implements Denorma
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesSELinuxContext';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecPrivilegesSELinuxContext';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecPrivilegesSELinuxContext();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Disable', $data) && $data['Disable'] !== null) {
             $object->setDisable($data['Disable']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecSecretsItemFileNormalizer.php b/src/Normalizer/TaskSpecContainerSpecSecretsItemFileNormalizer.php
index 7c6e623..9da9b52 100644
--- a/src/Normalizer/TaskSpecContainerSpecSecretsItemFileNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecSecretsItemFileNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecSecretsItemFileNormalizer implements DenormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItemFile';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItemFile';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecSecretsItemFile();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecContainerSpecSecretsItemNormalizer.php b/src/Normalizer/TaskSpecContainerSpecSecretsItemNormalizer.php
index 4ec0f3d..737d89f 100644
--- a/src/Normalizer/TaskSpecContainerSpecSecretsItemNormalizer.php
+++ b/src/Normalizer/TaskSpecContainerSpecSecretsItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecContainerSpecSecretsItemNormalizer implements DenormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecContainerSpecSecretsItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('File', $data) && $data['File'] !== null) {
             $object->setFile($this->denormalizer->denormalize($data['File'], 'Docker\\Api\\Model\\TaskSpecContainerSpecSecretsItemFile', 'json', $context));
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecLogDriverNormalizer.php b/src/Normalizer/TaskSpecLogDriverNormalizer.php
index 199ed6d..a27922b 100644
--- a/src/Normalizer/TaskSpecLogDriverNormalizer.php
+++ b/src/Normalizer/TaskSpecLogDriverNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecLogDriverNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecLogDriver';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecLogDriver';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecLogDriver();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecNetworkAttachmentSpecNormalizer.php b/src/Normalizer/TaskSpecNetworkAttachmentSpecNormalizer.php
index d74ae11..25062f4 100644
--- a/src/Normalizer/TaskSpecNetworkAttachmentSpecNormalizer.php
+++ b/src/Normalizer/TaskSpecNetworkAttachmentSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecNetworkAttachmentSpecNormalizer implements DenormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecNetworkAttachmentSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecNetworkAttachmentSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecNetworkAttachmentSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ContainerID', $data) && $data['ContainerID'] !== null) {
             $object->setContainerID($data['ContainerID']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecNormalizer.php b/src/Normalizer/TaskSpecNormalizer.php
index b5a7aec..c4ebcc3 100644
--- a/src/Normalizer/TaskSpecNormalizer.php
+++ b/src/Normalizer/TaskSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecNormalizer implements DenormalizerInterface, NormalizerInterface,
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('PluginSpec', $data) && $data['PluginSpec'] !== null) {
             $object->setPluginSpec($this->denormalizer->denormalize($data['PluginSpec'], 'Docker\\Api\\Model\\TaskSpecPluginSpec', 'json', $context));
         }
@@ -99,6 +108,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecPlacementNormalizer.php b/src/Normalizer/TaskSpecPlacementNormalizer.php
index aacc2aa..c00ff16 100644
--- a/src/Normalizer/TaskSpecPlacementNormalizer.php
+++ b/src/Normalizer/TaskSpecPlacementNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecPlacementNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecPlacement';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecPlacement';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecPlacement();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Constraints', $data) && $data['Constraints'] !== null) {
             $values = array();
             foreach ($data['Constraints'] as $value) {
@@ -71,6 +80,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecPlacementPreferencesItemNormalizer.php b/src/Normalizer/TaskSpecPlacementPreferencesItemNormalizer.php
index 32b1a9c..71da8a0 100644
--- a/src/Normalizer/TaskSpecPlacementPreferencesItemNormalizer.php
+++ b/src/Normalizer/TaskSpecPlacementPreferencesItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecPlacementPreferencesItemNormalizer implements DenormalizerInterfac
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecPlacementPreferencesItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Spread', $data) && $data['Spread'] !== null) {
             $object->setSpread($this->denormalizer->denormalize($data['Spread'], 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItemSpread', 'json', $context));
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecPlacementPreferencesItemSpreadNormalizer.php b/src/Normalizer/TaskSpecPlacementPreferencesItemSpreadNormalizer.php
index 0282955..e734c35 100644
--- a/src/Normalizer/TaskSpecPlacementPreferencesItemSpreadNormalizer.php
+++ b/src/Normalizer/TaskSpecPlacementPreferencesItemSpreadNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecPlacementPreferencesItemSpreadNormalizer implements DenormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItemSpread';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecPlacementPreferencesItemSpread';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecPlacementPreferencesItemSpread();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('SpreadDescriptor', $data) && $data['SpreadDescriptor'] !== null) {
             $object->setSpreadDescriptor($data['SpreadDescriptor']);
         }
@@ -41,6 +50,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecPluginSpecNormalizer.php b/src/Normalizer/TaskSpecPluginSpecNormalizer.php
index 4d677ec..1ab60ce 100644
--- a/src/Normalizer/TaskSpecPluginSpecNormalizer.php
+++ b/src/Normalizer/TaskSpecPluginSpecNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecPluginSpecNormalizer implements DenormalizerInterface, NormalizerI
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecPluginSpec';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecPluginSpec';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecPluginSpec();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -63,6 +72,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecPluginSpecPluginPrivilegeItemNormalizer.php b/src/Normalizer/TaskSpecPluginSpecPluginPrivilegeItemNormalizer.php
index d0fc121..f627254 100644
--- a/src/Normalizer/TaskSpecPluginSpecPluginPrivilegeItemNormalizer.php
+++ b/src/Normalizer/TaskSpecPluginSpecPluginPrivilegeItemNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecPluginSpecPluginPrivilegeItemNormalizer implements DenormalizerInt
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecPluginSpecPluginPrivilegeItem';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecPluginSpecPluginPrivilegeItem';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecPluginSpecPluginPrivilegeItem();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -57,6 +66,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecResourcesNormalizer.php b/src/Normalizer/TaskSpecResourcesNormalizer.php
index 038d399..4d66678 100644
--- a/src/Normalizer/TaskSpecResourcesNormalizer.php
+++ b/src/Normalizer/TaskSpecResourcesNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecResourcesNormalizer implements DenormalizerInterface, NormalizerIn
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecResources';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecResources';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecResources();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Limits', $data) && $data['Limits'] !== null) {
             $object->setLimits($this->denormalizer->denormalize($data['Limits'], 'Docker\\Api\\Model\\ResourceObject', 'json', $context));
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskSpecRestartPolicyNormalizer.php b/src/Normalizer/TaskSpecRestartPolicyNormalizer.php
index de193de..27426d3 100644
--- a/src/Normalizer/TaskSpecRestartPolicyNormalizer.php
+++ b/src/Normalizer/TaskSpecRestartPolicyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskSpecRestartPolicyNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskSpecRestartPolicy';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskSpecRestartPolicy';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskSpecRestartPolicy();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Condition', $data) && $data['Condition'] !== null) {
             $object->setCondition($data['Condition']);
         }
@@ -59,6 +68,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskStatusContainerStatusNormalizer.php b/src/Normalizer/TaskStatusContainerStatusNormalizer.php
index 774b64a..4f412d2 100644
--- a/src/Normalizer/TaskStatusContainerStatusNormalizer.php
+++ b/src/Normalizer/TaskStatusContainerStatusNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskStatusContainerStatusNormalizer implements DenormalizerInterface, Norm
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskStatusContainerStatus';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskStatusContainerStatus';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskStatusContainerStatus();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('ContainerID', $data) && $data['ContainerID'] !== null) {
             $object->setContainerID($data['ContainerID']);
         }
@@ -53,6 +62,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/TaskStatusNormalizer.php b/src/Normalizer/TaskStatusNormalizer.php
index 3053cef..4d25f3a 100644
--- a/src/Normalizer/TaskStatusNormalizer.php
+++ b/src/Normalizer/TaskStatusNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class TaskStatusNormalizer implements DenormalizerInterface, NormalizerInterface
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\TaskStatus';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\TaskStatus';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\TaskStatus();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Timestamp', $data) && $data['Timestamp'] !== null) {
             $object->setTimestamp($data['Timestamp']);
         }
@@ -65,6 +74,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/ThrottleDeviceNormalizer.php b/src/Normalizer/ThrottleDeviceNormalizer.php
index f9f3dfb..d73a92a 100644
--- a/src/Normalizer/ThrottleDeviceNormalizer.php
+++ b/src/Normalizer/ThrottleDeviceNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class ThrottleDeviceNormalizer implements DenormalizerInterface, NormalizerInter
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\ThrottleDevice';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\ThrottleDevice';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\ThrottleDevice();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Path', $data) && $data['Path'] !== null) {
             $object->setPath($data['Path']);
         }
@@ -47,6 +56,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/VolumeNormalizer.php b/src/Normalizer/VolumeNormalizer.php
index d291bed..1558d00 100644
--- a/src/Normalizer/VolumeNormalizer.php
+++ b/src/Normalizer/VolumeNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class VolumeNormalizer implements DenormalizerInterface, NormalizerInterface, De
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\Volume';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\Volume';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\Volume();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -101,18 +110,15 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getName()) {
-            $data['Name'] = $object->getName();
-        }
-        if (null !== $object->getDriver()) {
-            $data['Driver'] = $object->getDriver();
-        }
-        if (null !== $object->getMountpoint()) {
-            $data['Mountpoint'] = $object->getMountpoint();
-        }
+        $data['Name'] = $object->getName();
+        $data['Driver'] = $object->getDriver();
+        $data['Mountpoint'] = $object->getMountpoint();
         if (null !== $object->getCreatedAt()) {
             $data['CreatedAt'] = $object->getCreatedAt();
         }
@@ -123,23 +129,17 @@ public function normalize($object, $format = null, array $context = array())
             }
             $data['Status'] = $values;
         }
-        if (null !== $object->getLabels()) {
-            $values_1 = array();
-            foreach ($object->getLabels() as $key_1 => $value_1) {
-                $values_1[$key_1] = $value_1;
-            }
-            $data['Labels'] = $values_1;
-        }
-        if (null !== $object->getScope()) {
-            $data['Scope'] = $object->getScope();
+        $values_1 = array();
+        foreach ($object->getLabels() as $key_1 => $value_1) {
+            $values_1[$key_1] = $value_1;
         }
-        if (null !== $object->getOptions()) {
-            $values_2 = array();
-            foreach ($object->getOptions() as $key_2 => $value_2) {
-                $values_2[$key_2] = $value_2;
-            }
-            $data['Options'] = $values_2;
+        $data['Labels'] = $values_1;
+        $data['Scope'] = $object->getScope();
+        $values_2 = array();
+        foreach ($object->getOptions() as $key_2 => $value_2) {
+            $values_2[$key_2] = $value_2;
         }
+        $data['Options'] = $values_2;
         if (null !== $object->getUsageData()) {
             $data['UsageData'] = $this->normalizer->normalize($object->getUsageData(), 'json', $context);
         }
diff --git a/src/Normalizer/VolumeUsageDataNormalizer.php b/src/Normalizer/VolumeUsageDataNormalizer.php
index 9043b46..0077329 100644
--- a/src/Normalizer/VolumeUsageDataNormalizer.php
+++ b/src/Normalizer/VolumeUsageDataNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class VolumeUsageDataNormalizer implements DenormalizerInterface, NormalizerInte
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\VolumeUsageData';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\VolumeUsageData';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\VolumeUsageData();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Size', $data) && $data['Size'] !== null) {
             $object->setSize($data['Size']);
         }
@@ -47,15 +56,14 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getSize()) {
-            $data['Size'] = $object->getSize();
-        }
-        if (null !== $object->getRefCount()) {
-            $data['RefCount'] = $object->getRefCount();
-        }
+        $data['Size'] = $object->getSize();
+        $data['RefCount'] = $object->getRefCount();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/VolumesCreatePostBodyNormalizer.php b/src/Normalizer/VolumesCreatePostBodyNormalizer.php
index c94fc10..e4c5d7a 100644
--- a/src/Normalizer/VolumesCreatePostBodyNormalizer.php
+++ b/src/Normalizer/VolumesCreatePostBodyNormalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class VolumesCreatePostBodyNormalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\VolumesCreatePostBody';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\VolumesCreatePostBody';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\VolumesCreatePostBody();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Name', $data) && $data['Name'] !== null) {
             $object->setName($data['Name']);
         }
@@ -67,6 +76,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Normalizer/VolumesGetResponse200Normalizer.php b/src/Normalizer/VolumesGetResponse200Normalizer.php
index 0cca4d8..57a911e 100644
--- a/src/Normalizer/VolumesGetResponse200Normalizer.php
+++ b/src/Normalizer/VolumesGetResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class VolumesGetResponse200Normalizer implements DenormalizerInterface, Normaliz
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\VolumesGetResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\VolumesGetResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\VolumesGetResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('Volumes', $data) && $data['Volumes'] !== null) {
             $values = array();
             foreach ($data['Volumes'] as $value) {
@@ -55,23 +64,22 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
-        if (null !== $object->getVolumes()) {
-            $values = array();
-            foreach ($object->getVolumes() as $value) {
-                $values[] = $this->normalizer->normalize($value, 'json', $context);
-            }
-            $data['Volumes'] = $values;
+        $values = array();
+        foreach ($object->getVolumes() as $value) {
+            $values[] = $this->normalizer->normalize($value, 'json', $context);
         }
-        if (null !== $object->getWarnings()) {
-            $values_1 = array();
-            foreach ($object->getWarnings() as $value_1) {
-                $values_1[] = $value_1;
-            }
-            $data['Warnings'] = $values_1;
+        $data['Volumes'] = $values;
+        $values_1 = array();
+        foreach ($object->getWarnings() as $value_1) {
+            $values_1[] = $value_1;
         }
+        $data['Warnings'] = $values_1;
         return $data;
     }
 }
\ No newline at end of file
diff --git a/src/Normalizer/VolumesPrunePostResponse200Normalizer.php b/src/Normalizer/VolumesPrunePostResponse200Normalizer.php
index 483cf7c..ef4949b 100644
--- a/src/Normalizer/VolumesPrunePostResponse200Normalizer.php
+++ b/src/Normalizer/VolumesPrunePostResponse200Normalizer.php
@@ -2,8 +2,8 @@
 
 namespace Docker\Api\Normalizer;
 
-use Jane\JsonSchemaRuntime\Reference;
-use Jane\JsonSchemaRuntime\Normalizer\CheckArray;
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Docker\Api\Runtime\Normalizer\CheckArray;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -16,6 +16,9 @@ class VolumesPrunePostResponse200Normalizer implements DenormalizerInterface, No
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
     use CheckArray;
+    /**
+     * @return bool
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return $type === 'Docker\\Api\\Model\\VolumesPrunePostResponse200';
@@ -24,6 +27,9 @@ public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && get_class($data) === 'Docker\\Api\\Model\\VolumesPrunePostResponse200';
     }
+    /**
+     * @return mixed
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
         if (isset($data['$ref'])) {
@@ -33,6 +39,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
             return new Reference($data['$recursiveRef'], $context['document-origin']);
         }
         $object = new \Docker\Api\Model\VolumesPrunePostResponse200();
+        if (null === $data || false === \is_array($data)) {
+            return $object;
+        }
         if (\array_key_exists('VolumesDeleted', $data) && $data['VolumesDeleted'] !== null) {
             $values = array();
             foreach ($data['VolumesDeleted'] as $value) {
@@ -51,6 +60,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
         }
         return $object;
     }
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize($object, $format = null, array $context = array())
     {
         $data = array();
diff --git a/src/Runtime/Client/BaseEndpoint.php b/src/Runtime/Client/BaseEndpoint.php
new file mode 100644
index 0000000..e8ffb20
--- /dev/null
+++ b/src/Runtime/Client/BaseEndpoint.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Docker\Api\Runtime\Client;
+
+use Http\Message\MultipartStream\MultipartStreamBuilder;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Serializer\SerializerInterface;
+abstract class BaseEndpoint implements Endpoint
+{
+    protected $queryParameters = [];
+    protected $headerParameters = [];
+    protected $body;
+    public abstract function getMethod() : string;
+    public abstract function getBody(SerializerInterface $serializer, $streamFactory = null) : array;
+    public abstract function getUri() : string;
+    public abstract function getAuthenticationScopes() : array;
+    protected abstract function transformResponseBody(string $body, int $status, SerializerInterface $serializer, ?string $contentType = null);
+    protected function getExtraHeaders() : array
+    {
+        return [];
+    }
+    public function getQueryString() : string
+    {
+        $optionsResolved = $this->getQueryOptionsResolver()->resolve($this->queryParameters);
+        $optionsResolved = array_map(function ($value) {
+            return null !== $value ? $value : '';
+        }, $optionsResolved);
+        return http_build_query($optionsResolved, '', '&', PHP_QUERY_RFC3986);
+    }
+    public function getHeaders(array $baseHeaders = []) : array
+    {
+        return array_merge($this->getExtraHeaders(), $baseHeaders, $this->getHeadersOptionsResolver()->resolve($this->headerParameters));
+    }
+    protected function getQueryOptionsResolver() : OptionsResolver
+    {
+        return new OptionsResolver();
+    }
+    protected function getHeadersOptionsResolver() : OptionsResolver
+    {
+        return new OptionsResolver();
+    }
+    // ----------------------------------------------------------------------------------------------------
+    // Used for OpenApi2 compatibility
+    protected function getFormBody() : array
+    {
+        return [['Content-Type' => ['application/x-www-form-urlencoded']], http_build_query($this->getFormOptionsResolver()->resolve($this->formParameters))];
+    }
+    protected function getMultipartBody($streamFactory = null) : array
+    {
+        $bodyBuilder = new MultipartStreamBuilder($streamFactory);
+        $formParameters = $this->getFormOptionsResolver()->resolve($this->formParameters);
+        foreach ($formParameters as $key => $value) {
+            $bodyBuilder->addResource($key, $value);
+        }
+        return [['Content-Type' => ['multipart/form-data; boundary="' . ($bodyBuilder->getBoundary() . '"')]], $bodyBuilder->build()];
+    }
+    protected function getFormOptionsResolver() : OptionsResolver
+    {
+        return new OptionsResolver();
+    }
+    protected function getSerializedBody(SerializerInterface $serializer) : array
+    {
+        return [['Content-Type' => ['application/json']], $serializer->serialize($this->body, 'json')];
+    }
+}
\ No newline at end of file
diff --git a/src/Runtime/Client/Client.php b/src/Runtime/Client/Client.php
new file mode 100644
index 0000000..da6e104
--- /dev/null
+++ b/src/Runtime/Client/Client.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Docker\Api\Runtime\Client;
+
+use Jane\Component\OpenApiRuntime\Client\Plugin\AuthenticationRegistry;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\StreamInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+abstract class Client
+{
+    public const FETCH_RESPONSE = 'response';
+    public const FETCH_OBJECT = 'object';
+    /**
+     * @var ClientInterface
+     */
+    protected $httpClient;
+    /**
+     * @var RequestFactoryInterface
+     */
+    protected $requestFactory;
+    /**
+     * @var SerializerInterface
+     */
+    protected $serializer;
+    /**
+     * @var StreamFactoryInterface
+     */
+    protected $streamFactory;
+    public function __construct(ClientInterface $httpClient, RequestFactoryInterface $requestFactory, SerializerInterface $serializer, StreamFactoryInterface $streamFactory)
+    {
+        $this->httpClient = $httpClient;
+        $this->requestFactory = $requestFactory;
+        $this->serializer = $serializer;
+        $this->streamFactory = $streamFactory;
+    }
+    public function executeEndpoint(Endpoint $endpoint, string $fetch = self::FETCH_OBJECT)
+    {
+        [$bodyHeaders, $body] = $endpoint->getBody($this->serializer, $this->streamFactory);
+        $queryString = $endpoint->getQueryString();
+        $uriGlue = false === strpos($endpoint->getUri(), '?') ? '?' : '&';
+        $uri = $queryString !== '' ? $endpoint->getUri() . $uriGlue . $queryString : $endpoint->getUri();
+        $request = $this->requestFactory->createRequest($endpoint->getMethod(), $uri);
+        if ($body) {
+            if ($body instanceof StreamInterface) {
+                $request = $request->withBody($body);
+            } elseif (is_resource($body)) {
+                $request = $request->withBody($this->streamFactory->createStreamFromResource($body));
+            } elseif (strlen($body) <= 4000 && @file_exists($body)) {
+                // more than 4096 chars will trigger an error
+                $request = $request->withBody($this->streamFactory->createStreamFromFile($body));
+            } else {
+                $request = $request->withBody($this->streamFactory->createStream($body));
+            }
+        }
+        foreach ($endpoint->getHeaders($bodyHeaders) as $name => $value) {
+            $request = $request->withHeader($name, $value);
+        }
+        if (count($endpoint->getAuthenticationScopes()) > 0) {
+            $scopes = [];
+            foreach ($endpoint->getAuthenticationScopes() as $scope) {
+                $scopes[] = $scope;
+            }
+            $request = $request->withHeader(AuthenticationRegistry::SCOPES_HEADER, $scopes);
+        }
+        return $endpoint->parseResponse($this->httpClient->sendRequest($request), $this->serializer, $fetch);
+    }
+}
\ No newline at end of file
diff --git a/src/Runtime/Client/CustomQueryResolver.php b/src/Runtime/Client/CustomQueryResolver.php
new file mode 100644
index 0000000..8e5ba3a
--- /dev/null
+++ b/src/Runtime/Client/CustomQueryResolver.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Docker\Api\Runtime\Client;
+
+use Symfony\Component\OptionsResolver\Options;
+interface CustomQueryResolver
+{
+    public function __invoke(Options $options, $value);
+}
\ No newline at end of file
diff --git a/src/Runtime/Client/Endpoint.php b/src/Runtime/Client/Endpoint.php
new file mode 100644
index 0000000..b1d0017
--- /dev/null
+++ b/src/Runtime/Client/Endpoint.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Docker\Api\Runtime\Client;
+
+use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+interface Endpoint
+{
+    /**
+     * Get body for an endpoint.
+     *
+     * Return value consist of an array where the first item will be a list of headers to add on the request (like the Content Type)
+     * And the second value consist of the body object.
+     */
+    public function getBody(SerializerInterface $serializer, $streamFactory = null) : array;
+    /**
+     * Get the query string of an endpoint without the starting ? (like foo=foo&bar=bar).
+     */
+    public function getQueryString() : string;
+    /**
+     * Get the URI of an endpoint (like /foo-uri).
+     */
+    public function getUri() : string;
+    /**
+     * Get the HTTP method of an endpoint (like GET, POST, ...).
+     */
+    public function getMethod() : string;
+    /**
+     * Get the headers of an endpoint.
+     */
+    public function getHeaders(array $baseHeaders = []) : array;
+    /**
+     * Get security scopes of an endpoint.
+     */
+    public function getAuthenticationScopes() : array;
+    /**
+     * Parse and transform a PSR7 Response into a different object.
+     *
+     * Implementations may vary depending the status code of the response and the fetch mode used.
+     */
+    public function parseResponse(ResponseInterface $response, SerializerInterface $serializer, string $fetchMode = Client::FETCH_OBJECT);
+}
\ No newline at end of file
diff --git a/src/Runtime/Client/EndpointTrait.php b/src/Runtime/Client/EndpointTrait.php
new file mode 100644
index 0000000..bfb8318
--- /dev/null
+++ b/src/Runtime/Client/EndpointTrait.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Docker\Api\Runtime\Client;
+
+use Jane\Component\OpenApiRuntime\Client\Exception\InvalidFetchModeException;
+use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+trait EndpointTrait
+{
+    protected abstract function transformResponseBody(string $body, int $status, SerializerInterface $serializer, ?string $contentType = null);
+    public function parseResponse(ResponseInterface $response, SerializerInterface $serializer, string $fetchMode = Client::FETCH_OBJECT)
+    {
+        if ($fetchMode === Client::FETCH_OBJECT) {
+            $contentType = $response->hasHeader('Content-Type') ? current($response->getHeader('Content-Type')) : null;
+            return $this->transformResponseBody((string) $response->getBody(), $response->getStatusCode(), $serializer, $contentType);
+        }
+        if ($fetchMode === Client::FETCH_RESPONSE) {
+            return $response;
+        }
+        throw new InvalidFetchModeException(sprintf('Fetch mode %s is not supported', $fetchMode));
+    }
+}
\ No newline at end of file
diff --git a/src/Runtime/Normalizer/CheckArray.php b/src/Runtime/Normalizer/CheckArray.php
new file mode 100644
index 0000000..dc4f86c
--- /dev/null
+++ b/src/Runtime/Normalizer/CheckArray.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Docker\Api\Runtime\Normalizer;
+
+trait CheckArray
+{
+    public function isOnlyNumericKeys(array $array) : bool
+    {
+        return count(array_filter($array, function ($key) {
+            return is_numeric($key);
+        }, ARRAY_FILTER_USE_KEY)) === count($array);
+    }
+}
\ No newline at end of file
diff --git a/src/Runtime/Normalizer/ReferenceNormalizer.php b/src/Runtime/Normalizer/ReferenceNormalizer.php
new file mode 100644
index 0000000..b6ebc8c
--- /dev/null
+++ b/src/Runtime/Normalizer/ReferenceNormalizer.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Docker\Api\Runtime\Normalizer;
+
+use Jane\Component\JsonSchemaRuntime\Reference;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+class ReferenceNormalizer implements NormalizerInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function normalize($object, $format = null, array $context = [])
+    {
+        $ref = [];
+        $ref['$ref'] = (string) $object->getReferenceUri();
+        return $ref;
+    }
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsNormalization($data, $format = null)
+    {
+        return $data instanceof Reference;
+    }
+}
\ No newline at end of file