diff --git a/package-lock.json b/package-lock.json
index b00e49bb..9a3ddf56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "ng-dynamic-forms",
-      "version": "17.0.0",
+      "version": "18.0.0",
       "license": "ISC",
       "dependencies": {
         "@angular/animations": "^16.1.3",
@@ -544,6 +544,7 @@
       "version": "16.1.3",
       "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.1.3.tgz",
       "integrity": "sha512-aUqnIV9rRTBNgiQRS0Gv6lhghaGj1vpVRyXgiE4VnTR9uBONSsGKMNALYBBhXRTSk2e0cvutt0ubLgmNpdyWyQ==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "7.22.5",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -571,6 +572,7 @@
       "version": "7.5.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
       "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5503,6 +5505,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -5909,6 +5912,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -6458,6 +6462,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -8690,6 +8695,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -9650,6 +9656,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -10118,12 +10125,6 @@
         "jiti": "bin/jiti.js"
       }
     },
-    "node_modules/jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-      "peer": true
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -10752,6 +10753,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -11282,15 +11284,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/motion-ui": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/motion-ui/-/motion-ui-2.0.3.tgz",
-      "integrity": "sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==",
-      "peer": true,
-      "peerDependencies": {
-        "jquery": ">=2.2.0"
-      }
-    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -11696,6 +11689,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12550,17 +12544,6 @@
       "integrity": "sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g==",
       "dev": true
     },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/postcss": {
       "version": "8.4.24",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
@@ -13384,6 +13367,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -15365,6 +15349,7 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
       "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -15983,12 +15968,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/what-input": {
-      "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.2.10.tgz",
-      "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
-      "peer": true
-    },
     "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -16274,7 +16253,8 @@
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/yargs": {
       "version": "17.7.2",
@@ -16672,6 +16652,7 @@
       "version": "16.1.3",
       "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.1.3.tgz",
       "integrity": "sha512-aUqnIV9rRTBNgiQRS0Gv6lhghaGj1vpVRyXgiE4VnTR9uBONSsGKMNALYBBhXRTSk2e0cvutt0ubLgmNpdyWyQ==",
+      "dev": true,
       "requires": {
         "@babel/core": "7.22.5",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -16687,6 +16668,7 @@
           "version": "7.5.3",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
           "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+          "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -17215,8 +17197,7 @@
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.18.6",
@@ -19434,8 +19415,7 @@
       "version": "16.1.3",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.1.3.tgz",
       "integrity": "sha512-YTL1RzP7ErJqskx+ZwdC/nWsOSBfC4yYWmMyWL2J0d+oJ3N2XIzrKVoDcZ4IVzv3Du+3zoGp0ups/wWXvfzM/Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -20001,8 +19981,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz",
       "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webassemblyjs/ast": {
       "version": "1.11.6",
@@ -20200,8 +20179,7 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
       "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -20372,8 +20350,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "amdefine": {
       "version": "1.0.1",
@@ -20421,6 +20398,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -20739,7 +20717,8 @@
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
     },
     "bl": {
       "version": "4.1.0",
@@ -20853,8 +20832,7 @@
     "bootstrap": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
-      "requires": {}
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="
     },
     "brace-expansion": {
       "version": "1.1.11",
@@ -21154,6 +21132,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -22140,8 +22119,7 @@
           "version": "8.2.3",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
           "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -22842,8 +22820,7 @@
     "foundation-sites": {
       "version": "6.7.5",
       "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.7.5.tgz",
-      "integrity": "sha512-MEjAENdF/IV2XQvlQmg20o+iDTyyWu0N/j440e8fKbEylbKxARzgg5S7vcnxtjukC1Lqg+rRm7ZDSSyGhVVoUQ==",
-      "requires": {}
+      "integrity": "sha512-MEjAENdF/IV2XQvlQmg20o+iDTyyWu0N/j440e8fKbEylbKxARzgg5S7vcnxtjukC1Lqg+rRm7ZDSSyGhVVoUQ=="
     },
     "fraction.js": {
       "version": "4.2.0",
@@ -22899,6 +22876,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -23404,8 +23382,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ieee754": {
       "version": "1.2.1",
@@ -23637,6 +23614,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -23982,12 +23960,6 @@
       "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
       "dev": true
     },
-    "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-      "peer": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -24224,8 +24196,7 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz",
       "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "karma-source-map-support": {
       "version": "1.4.0",
@@ -24471,6 +24442,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -24875,13 +24847,6 @@
         }
       }
     },
-    "motion-ui": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/motion-ui/-/motion-ui-2.0.3.tgz",
-      "integrity": "sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==",
-      "peer": true,
-      "requires": {}
-    },
     "mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -25175,7 +25140,8 @@
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
@@ -25729,8 +25695,7 @@
       "version": "2.12.313",
       "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz",
       "integrity": "sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "pdfmake": {
       "version": "0.2.7",
@@ -25819,12 +25784,6 @@
       "integrity": "sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g==",
       "dev": true
     },
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "peer": true
-    },
     "postcss": {
       "version": "8.4.24",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
@@ -25863,8 +25822,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.3",
@@ -26441,6 +26399,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -27981,7 +27940,8 @@
     "typescript": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA=="
+      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "dev": true
     },
     "ua-parser-js": {
       "version": "0.7.31",
@@ -28378,12 +28338,6 @@
       "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
-    "what-input": {
-      "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.2.10.tgz",
-      "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
-      "peer": true
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -28543,8 +28497,7 @@
       "version": "8.13.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
       "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "xml2js": {
       "version": "0.4.23",
@@ -28595,7 +28548,8 @@
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "yargs": {
       "version": "17.7.2",
@@ -28661,4 +28615,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/projects/ng-dynamic-forms/core/src/lib/model/misc/dynamic-form-control-relation.model.ts b/projects/ng-dynamic-forms/core/src/lib/model/misc/dynamic-form-control-relation.model.ts
index e8b06b50..e3ff4aa8 100644
--- a/projects/ng-dynamic-forms/core/src/lib/model/misc/dynamic-form-control-relation.model.ts
+++ b/projects/ng-dynamic-forms/core/src/lib/model/misc/dynamic-form-control-relation.model.ts
@@ -3,6 +3,7 @@ export interface DynamicFormControlCondition {
     rootPath?: string;
     status?: string;
     value?: any;
+    matched?: (relatedFormControlValue: any) => boolean; // Has precedence over value
 }
 
 export interface DynamicFormControlRelation {
diff --git a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.spec.ts b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.spec.ts
index b28aa528..cad901ba 100644
--- a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.spec.ts
+++ b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.spec.ts
@@ -1,10 +1,10 @@
-import { TestBed, inject } from "@angular/core/testing";
-import { UntypedFormGroup, ReactiveFormsModule } from "@angular/forms";
-import { DynamicFormRelationService } from "./dynamic-form-relation.service";
-import { DynamicTextAreaModel } from "../model/textarea/dynamic-textarea.model";
-import { DynamicFormService } from "./dynamic-form.service";
-import { DynamicSelectModel } from "../model/select/dynamic-select.model";
-import { DynamicRadioGroupModel } from "../model/radio/dynamic-radio-group.model";
+import {TestBed, inject} from "@angular/core/testing";
+import {UntypedFormGroup, ReactiveFormsModule} from "@angular/forms";
+import {DynamicFormRelationService} from "./dynamic-form-relation.service";
+import {DynamicTextAreaModel} from "../model/textarea/dynamic-textarea.model";
+import {DynamicFormService} from "./dynamic-form.service";
+import {DynamicSelectModel} from "../model/select/dynamic-select.model";
+import {DynamicRadioGroupModel} from "../model/radio/dynamic-radio-group.model";
 import {
     AND_OPERATOR,
     DISABLED_MATCHER_PROVIDER,
@@ -17,6 +17,12 @@ import {
     REQUIRED_MATCHER_PROVIDER,
     REQUIRED_MATCHER
 } from "./dynamic-form-relation-matchers";
+import {DynamicFormControlCondition} from "../model/misc/dynamic-form-control-relation.model";
+
+interface User {
+    uuid: string;
+    name: string;
+}
 
 describe("DynamicFormRelationService test suite", () => {
     let service: DynamicFormRelationService;
@@ -95,6 +101,21 @@ describe("DynamicFormRelationService test suite", () => {
             {id: "testRadioGroup", value: "option-2"}
         ]
     };
+    const relDisabledOr23WithMatched = {
+        match: MATCH_DISABLED,
+        operator: OR_OPERATOR,
+        when: [
+            {id: "testSelect", matched: (value) => value === "option-2"},
+            {id: "testRadioGroup", value: "option-3"}
+        ] as DynamicFormControlCondition[]
+    };
+    const relDisabledObject = {
+        match: MATCH_DISABLED,
+        operator: OR_OPERATOR,
+        when: [
+            {id: "userSelect", matched: (value) => value.uuid === "2"},
+        ] as DynamicFormControlCondition[]
+    };
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -117,6 +138,15 @@ describe("DynamicFormRelationService test suite", () => {
                     options: [{value: "option-1"}, {value: "option-2"}, {value: "option-3"}],
                     value: "option-1"
                 }),
+                new DynamicSelectModel<User>({
+                    id: "userSelect",
+                    options: [
+                        {value: {uuid: "1", name: "User 1"}},
+                        {value: {uuid: "2", name: "User 2"}},
+                        {value: {uuid: "3", name: "User 3"}}
+                    ],
+                    value: {uuid: "1", name: "User 1"}
+                }),
                 model
             ]);
         }));
@@ -147,6 +177,13 @@ describe("DynamicFormRelationService test suite", () => {
 
         model.relations = [relDisabledOr13];
         expect(service.matchesCondition(model.relations[0], service.getRelatedFormControls(model, group), DISABLED_MATCHER)).toBe(true);
+
+        model.relations = [relDisabledOr23WithMatched];
+        expect(service.matchesCondition(model.relations[0], service.getRelatedFormControls(model, group), DISABLED_MATCHER)).toBe(false);
+
+        model.relations = [relDisabledObject];
+        expect(service.matchesCondition(model.relations[0], service.getRelatedFormControls(model, group), DISABLED_MATCHER)).toBe(false);
+
     });
 
     it("should check if form control is to be required correctly", () => {
diff --git a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.ts b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.ts
index f28bb729..07a05994 100644
--- a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.ts
+++ b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.ts
@@ -1,16 +1,16 @@
-import { Inject, Injectable, Injector, Optional } from "@angular/core";
-import { UntypedFormControl, UntypedFormGroup } from "@angular/forms";
-import { DynamicFormControlModel } from "../model/dynamic-form-control.model";
+import {Inject, Injectable, Injector, Optional} from "@angular/core";
+import {UntypedFormControl, UntypedFormGroup} from "@angular/forms";
+import {DynamicFormControlModel} from "../model/dynamic-form-control.model";
 import {
     AND_OPERATOR,
     DYNAMIC_MATCHERS,
     DynamicFormControlMatcher,
     OR_OPERATOR
 } from "./dynamic-form-relation-matchers";
-import { DynamicFormControlCondition, DynamicFormControlRelation } from "../model/misc/dynamic-form-control-relation.model";
-import { distinctUntilChanged, startWith } from "rxjs/operators";
-import { merge, Subscription } from "rxjs";
-import { isString } from "../utils/core.utils";
+import {DynamicFormControlCondition, DynamicFormControlRelation} from "../model/misc/dynamic-form-control-relation.model";
+import {distinctUntilChanged, startWith} from "rxjs/operators";
+import {merge, Subscription} from "rxjs";
+import {isString} from "../utils/core.utils";
 
 export type DynamicRelatedFormControls = { [path: string]: UntypedFormControl };
 
@@ -62,7 +62,16 @@ export class DynamicFormRelationService {
                 }
             }
 
-            if (relatedFormControl && relation.match === matcher.match) {
+            if (!relatedFormControl) {
+                return false;
+            }
+
+            const shouldCheckMatcher = relation.match === matcher.match || relation.match === matcher.opposingMatch;
+            const matched = !shouldCheckMatcher ? false : (
+                condition.matched ? condition.matched(relatedFormControl.value) : condition.value === relatedFormControl.value
+            );
+
+            if (relation.match === matcher.match) {
                 if (index > 0 && operator === AND_OPERATOR && !hasMatched) {
                     return false;
                 }
@@ -71,10 +80,10 @@ export class DynamicFormRelationService {
                     return true;
                 }
 
-                return condition.value === relatedFormControl.value || condition.status === relatedFormControl.status;
+                return matched || condition.status === relatedFormControl.status;
             }
 
-            if (relatedFormControl && relation.match === matcher.opposingMatch) {
+            if (relation.match === matcher.opposingMatch) {
                 if (index > 0 && operator === AND_OPERATOR && hasMatched) {
                     return true;
                 }
@@ -83,7 +92,7 @@ export class DynamicFormRelationService {
                     return false;
                 }
 
-                return !(condition.value === relatedFormControl.value || condition.status === relatedFormControl.status);
+                return !(matched || condition.status === relatedFormControl.status);
             }
 
             return false;