diff --git a/package-lock.json b/package-lock.json
index beaf7e7..8d22e6c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@semantic-release/npm": "^13.1.3",
         "@semantic-release/release-notes-generator": "^14.1.0",
         "@speclynx/apidom-core": "^2.2.2",
-        "@speclynx/apidom-datamodel": "^2.2.2",
+        "@speclynx/apidom-datamodel": "^4.16.0",
         "@speclynx/apidom-ns-openapi-3-0": "^2.2.2",
         "apg-js": "^4.4.0",
         "babel-loader": "^10.0.0",
@@ -2819,7 +2819,7 @@
         "yaml": "^2.8.2"
       }
     },
-    "node_modules/@speclynx/apidom-datamodel": {
+    "node_modules/@speclynx/apidom-core/node_modules/@speclynx/apidom-datamodel": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-2.13.1.tgz",
       "integrity": "sha512-OqclcKVuaLMKKf+rDbsh+VR/ZFOLs9oeLAVhSAWTH0D9hJ/i8LuNVNj039XJ1Za8ZpqF2G675W4behpzaAA5vA==",
@@ -2831,6 +2831,38 @@
         "ramda": "~0.32.0"
       }
     },
+    "node_modules/@speclynx/apidom-datamodel": {
+      "version": "4.16.0",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-4.16.0.tgz",
+      "integrity": "sha512-CzC26LKbnyCQfMVkV5v0GjQfuyiwIyk2ZDVNvOL/iykGlE4yJpX4KnPtQzWp/+O6m2Sp9oYfEAoGKZp/PSzlRA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^8.0.0",
+        "@speclynx/apidom-error": "4.16.0",
+        "ramda": "~0.32.0"
+      }
+    },
+    "node_modules/@speclynx/apidom-datamodel/node_modules/@babel/runtime-corejs3": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-8.0.0.tgz",
+      "integrity": "sha512-W4MtIy0UAB61P7MJZ8it4/oT05emtQWhyAQ+Z0kh9ofVNwmXCTrhea3OdqvViMgjw4a0d5NUq1IqoVkdyhborQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-js-pure": "^3.48.0"
+      }
+    },
+    "node_modules/@speclynx/apidom-datamodel/node_modules/@speclynx/apidom-error": {
+      "version": "4.16.0",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-error/-/apidom-error-4.16.0.tgz",
+      "integrity": "sha512-aAkJEOvMwF0Q39zA6ASQEsHUck+GReWOEPypjf4WnDTE4sP7qDi2ZSUxMuFPuXseQE0IceXd7/BoQ/V4H+7dfQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^8.0.0"
+      }
+    },
     "node_modules/@speclynx/apidom-error": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/@speclynx/apidom-error/-/apidom-error-2.13.1.tgz",
@@ -2854,6 +2886,18 @@
         "@swaggerexpert/jsonpath": "^4.0.3"
       }
     },
+    "node_modules/@speclynx/apidom-json-path/node_modules/@speclynx/apidom-datamodel": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-2.13.1.tgz",
+      "integrity": "sha512-OqclcKVuaLMKKf+rDbsh+VR/ZFOLs9oeLAVhSAWTH0D9hJ/i8LuNVNj039XJ1Za8ZpqF2G675W4behpzaAA5vA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^7.28.4",
+        "@speclynx/apidom-error": "2.13.1",
+        "ramda": "~0.32.0"
+      }
+    },
     "node_modules/@speclynx/apidom-json-pointer": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/@speclynx/apidom-json-pointer/-/apidom-json-pointer-2.13.1.tgz",
@@ -2867,6 +2911,18 @@
         "@swaggerexpert/json-pointer": "^3.0.1"
       }
     },
+    "node_modules/@speclynx/apidom-json-pointer/node_modules/@speclynx/apidom-datamodel": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-2.13.1.tgz",
+      "integrity": "sha512-OqclcKVuaLMKKf+rDbsh+VR/ZFOLs9oeLAVhSAWTH0D9hJ/i8LuNVNj039XJ1Za8ZpqF2G675W4behpzaAA5vA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^7.28.4",
+        "@speclynx/apidom-error": "2.13.1",
+        "ramda": "~0.32.0"
+      }
+    },
     "node_modules/@speclynx/apidom-ns-json-schema-draft-4": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/@speclynx/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-2.13.1.tgz",
@@ -2883,6 +2939,18 @@
         "ts-mixer": "^6.0.4"
       }
     },
+    "node_modules/@speclynx/apidom-ns-json-schema-draft-4/node_modules/@speclynx/apidom-datamodel": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-2.13.1.tgz",
+      "integrity": "sha512-OqclcKVuaLMKKf+rDbsh+VR/ZFOLs9oeLAVhSAWTH0D9hJ/i8LuNVNj039XJ1Za8ZpqF2G675W4behpzaAA5vA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^7.28.4",
+        "@speclynx/apidom-error": "2.13.1",
+        "ramda": "~0.32.0"
+      }
+    },
     "node_modules/@speclynx/apidom-ns-openapi-3-0": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/@speclynx/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-2.13.1.tgz",
@@ -2901,6 +2969,18 @@
         "ts-mixer": "^6.0.4"
       }
     },
+    "node_modules/@speclynx/apidom-ns-openapi-3-0/node_modules/@speclynx/apidom-datamodel": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-2.13.1.tgz",
+      "integrity": "sha512-OqclcKVuaLMKKf+rDbsh+VR/ZFOLs9oeLAVhSAWTH0D9hJ/i8LuNVNj039XJ1Za8ZpqF2G675W4behpzaAA5vA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^7.28.4",
+        "@speclynx/apidom-error": "2.13.1",
+        "ramda": "~0.32.0"
+      }
+    },
     "node_modules/@speclynx/apidom-traverse": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/@speclynx/apidom-traverse/-/apidom-traverse-2.13.1.tgz",
@@ -2916,6 +2996,18 @@
         "ramda-adjunct": "^6.0.0"
       }
     },
+    "node_modules/@speclynx/apidom-traverse/node_modules/@speclynx/apidom-datamodel": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/@speclynx/apidom-datamodel/-/apidom-datamodel-2.13.1.tgz",
+      "integrity": "sha512-OqclcKVuaLMKKf+rDbsh+VR/ZFOLs9oeLAVhSAWTH0D9hJ/i8LuNVNj039XJ1Za8ZpqF2G675W4behpzaAA5vA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^7.28.4",
+        "@speclynx/apidom-error": "2.13.1",
+        "ramda": "~0.32.0"
+      }
+    },
     "node_modules/@swaggerexpert/json-pointer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@swaggerexpert/json-pointer/-/json-pointer-3.0.1.tgz",
diff --git a/package.json b/package.json
index 731871c..6117468 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "@babel/preset-env": "=8.0.2",
     "@commitlint/cli": "=20.3.1",
     "@commitlint/config-conventional": "=21.2.0",
-    "@speclynx/apidom-datamodel": "^2.2.2",
+    "@speclynx/apidom-datamodel": "^4.16.0",
     "@speclynx/apidom-core": "^2.2.2",
     "@speclynx/apidom-ns-openapi-3-0": "^2.2.2",
     "@semantic-release/commit-analyzer": "^13.0.1",