diff --git a/package-lock.json b/package-lock.json
index e104be4..26060c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@advanced-rest-client/events": "^0.2.29",
         "@koa/cors": "^3.1.0",
         "@koa/router": "^10.1.1",
-        "amf-client-js": "^5.0.0-SEMANTIC-JSONSCHEMA.6",
+        "amf-client-js": "^5.7.0",
         "fs-extra": "^10.0.0",
         "koa": "^2.13.4",
         "tmp-promise": "^3.0.3",
@@ -52,6 +52,12 @@
       "resolved": "https://registry.npmjs.org/@advanced-rest-client/events/-/events-0.2.32.tgz",
       "integrity": "sha512-utzItgaFzNzHu6GMrSSrnG0OiqLka0N9k4AnD/RIe1sszRTlj3d4JblfjBtZeoC9DmHE3pPZYQ+cBkPkB+Ka8g=="
     },
+    "node_modules/@aml-org/amf-antlr-parsers": {
+      "version": "0.8.28",
+      "resolved": "https://registry.npmjs.org/@aml-org/amf-antlr-parsers/-/amf-antlr-parsers-0.8.28.tgz",
+      "integrity": "sha512-gI6LMlwUdux/SXz5VbPXD0pp3UxhpD4kKc2gzIHIEZBpbmP9KgiDbS0UtuL9uQEw9pduyzAID18lhpGEh16zEg==",
+      "license": "ISC"
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
@@ -1374,11 +1380,14 @@
       }
     },
     "node_modules/amf-client-js": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/amf-client-js/-/amf-client-js-5.0.4.tgz",
-      "integrity": "sha512-9FsznZvXqs8QbXHXAuhMugTHxq9lrRyEdTvPWjE3QFyH7bwHwc83sQT3839AkZOPsB4dcRPLIVigAQtwL1jMxA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/amf-client-js/-/amf-client-js-5.7.0.tgz",
+      "integrity": "sha512-hL3E7LbyAUweVkN+LlhikmyojhKTx/VFOB7HWTmrID5CjWbm1zksI37MnhN8RuwGK8egXJs5DEX+BbGrew+Zxg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "ajv": "6.12.6"
+        "@aml-org/amf-antlr-parsers": "0.8.28",
+        "ajv": "6.12.6",
+        "avro-js": "1.11.3"
       },
       "bin": {
         "amf": "bin/amf"
@@ -1523,6 +1532,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/avro-js": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/avro-js/-/avro-js-1.11.3.tgz",
+      "integrity": "sha512-B1b0wI5iwSkVwj3RQWRzW99/LGoYl6df9j1kWime8r8b0dXCdKU7t7mEOFkOpQFaT/I9JXaL7KAIxM+/3TUk1A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "underscore": "^1.13.2"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -5948,6 +5966,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/underscore": {
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
+      "license": "MIT"
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -6349,6 +6373,11 @@
       "resolved": "https://registry.npmjs.org/@advanced-rest-client/events/-/events-0.2.32.tgz",
       "integrity": "sha512-utzItgaFzNzHu6GMrSSrnG0OiqLka0N9k4AnD/RIe1sszRTlj3d4JblfjBtZeoC9DmHE3pPZYQ+cBkPkB+Ka8g=="
     },
+    "@aml-org/amf-antlr-parsers": {
+      "version": "0.8.28",
+      "resolved": "https://registry.npmjs.org/@aml-org/amf-antlr-parsers/-/amf-antlr-parsers-0.8.28.tgz",
+      "integrity": "sha512-gI6LMlwUdux/SXz5VbPXD0pp3UxhpD4kKc2gzIHIEZBpbmP9KgiDbS0UtuL9uQEw9pduyzAID18lhpGEh16zEg=="
+    },
     "@ampproject/remapping": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
@@ -7401,11 +7430,13 @@
       }
     },
     "amf-client-js": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/amf-client-js/-/amf-client-js-5.0.4.tgz",
-      "integrity": "sha512-9FsznZvXqs8QbXHXAuhMugTHxq9lrRyEdTvPWjE3QFyH7bwHwc83sQT3839AkZOPsB4dcRPLIVigAQtwL1jMxA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/amf-client-js/-/amf-client-js-5.7.0.tgz",
+      "integrity": "sha512-hL3E7LbyAUweVkN+LlhikmyojhKTx/VFOB7HWTmrID5CjWbm1zksI37MnhN8RuwGK8egXJs5DEX+BbGrew+Zxg==",
       "requires": {
-        "ajv": "6.12.6"
+        "@aml-org/amf-antlr-parsers": "0.8.28",
+        "ajv": "6.12.6",
+        "avro-js": "1.11.3"
       }
     },
     "ansi-colors": {
@@ -7505,6 +7536,14 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
+    "avro-js": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/avro-js/-/avro-js-1.11.3.tgz",
+      "integrity": "sha512-B1b0wI5iwSkVwj3RQWRzW99/LGoYl6df9j1kWime8r8b0dXCdKU7t7mEOFkOpQFaT/I9JXaL7KAIxM+/3TUk1A==",
+      "requires": {
+        "underscore": "^1.13.2"
+      }
+    },
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -10752,6 +10791,11 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "underscore": {
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="
+    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
diff --git a/package.json b/package.json
index 1a2bbbd..2169301 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@advanced-rest-client/events": "^0.2.29",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^10.1.1",
-    "amf-client-js": "^5.0.0-SEMANTIC-JSONSCHEMA.6",
+    "amf-client-js": "^5.7.0",
     "fs-extra": "^10.0.0",
     "koa": "^2.13.4",
     "tmp-promise": "^3.0.3",