diff --git a/apps/demo-renderer-app/package-lock.json b/apps/demo-renderer-app/package-lock.json
index 80526e64..8fbfeeee 100644
--- a/apps/demo-renderer-app/package-lock.json
+++ b/apps/demo-renderer-app/package-lock.json
@@ -27,20 +27,22 @@
     },
     "../../packages/smart-forms-renderer": {
       "name": "@aehrc/smart-forms-renderer",
-      "version": "0.34.0",
+      "version": "0.35.8",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aehrc/sdc-populate": "^2.2.0",
+        "@aehrc/sdc-populate": "^2.2.3",
         "@iconify/react": "^4.1.1",
         "dayjs": "^1.11.10",
         "deep-diff": "^1.0.2",
         "fhirclient": "^2.5.2",
-        "fhirpath": "^3.7.1",
+        "fhirpath": "3.11.0",
         "html-react-parser": "4.2.10",
         "js-base64": "^3.7.7",
         "lodash.clonedeep": "^4.5.0",
         "lodash.debounce": "^4.0.8",
-        "nanoid": "^5.0.1",
+        "lodash.difference": "^4.5.0",
+        "lodash.intersection": "^4.4.0",
+        "nanoid": "^5.0.7",
         "react-beautiful-dnd": "^13.1.1",
         "react-dnd": "^16.0.1",
         "react-dnd-html5-backend": "^16.0.1",
@@ -60,7 +62,7 @@
         "@storybook/react-vite": "^8.0.10",
         "@storybook/test": "^8.0.10",
         "@swc/cli": "^0.1.63",
-        "@swc/core": "^1.3.99",
+        "@swc/core": "^1.5.28",
         "@testing-library/jest-dom": "^6.1.2",
         "@testing-library/react": "^14.2.1",
         "@testing-library/react-hooks": "^7.0.2",
@@ -72,12 +74,12 @@
         "@types/react": ">=17.0.0",
         "@types/react-beautiful-dnd": "^13.1.7",
         "@types/react-dom": ">=18.2.22",
-        "chokidar": "^3.5.3",
+        "chokidar": "^3.6.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "storybook": "^8.0.10",
         "ts-jest": "^29.1.1",
-        "tslib": "^2.6.2",
+        "tslib": "^2.6.3",
         "typescript": "^5.2.2"
       },
       "peerDependencies": {
@@ -6747,9 +6749,9 @@
       }
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "optional": true,
       "peer": true,
       "engines": {
@@ -13625,9 +13627,9 @@
       "peer": true
     },
     "node_modules/metro-inspector-proxy/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "optional": true,
       "peer": true,
       "engines": {
@@ -13983,9 +13985,9 @@
       }
     },
     "node_modules/metro/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "optional": true,
       "peer": true,
       "engines": {
@@ -15401,9 +15403,9 @@
       }
     },
     "node_modules/react-devtools-core/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "optional": true,
       "peer": true,
       "engines": {
@@ -15545,9 +15547,9 @@
       }
     },
     "node_modules/react-native/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
+      "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
       "optional": true,
       "peer": true,
       "dependencies": {
@@ -17476,9 +17478,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "optional": true,
       "peer": true,
       "engines": {