diff --git a/components/QuestionnaireExtractTest.vue b/components/QuestionnaireExtractTest.vue
index 536bb30..7aaf58c 100644
--- a/components/QuestionnaireExtractTest.vue
+++ b/components/QuestionnaireExtractTest.vue
@@ -1,17 +1,22 @@
 <template>
   <div style="display: flex; flex-direction: column; height: 100%;">
-    <v-text-field label="Extract Service URL" v-model="extractServiceUrl" :loading="extractingInProgress">
-      <template v-slot:append>
+    <v-select label="Extraction Engine" class="engineSelector" :items="executionEngines" v-model="selectedEngine"
+              hide-details="auto" :loading="extractingInProgress">
+      <template v-slot:append-outer>
+        <div style="display: flex; margin-top: -8px;">
         <v-btn @click="performExtractOperation">
           <v-icon> mdi-tray-arrow-up </v-icon>
           &nbsp;Extract
         </v-btn>
-      </template>
-      <template v-slot:append-outer>
         <v-btn icon v-if="showShareLink()" @click="shareToClipboard()"
-          title="Copy Bundle to clipboard"><v-icon>mdi-content-copy</v-icon></v-btn>
+               title="Copy Bundle to clipboard"><v-icon>mdi-content-copy</v-icon></v-btn></div>
       </template>
-    </v-text-field>
+    </v-select>
+
+    <div style="margin-bottom: 8px;" v-if="selectedEngine !== 'Other $extract'"/>
+
+    <v-text-field label="Extract Service URL" v-model="extractServiceUrl" v-if="selectedEngine == 'Other $extract'"/>
+
     <resource-editor style="flex-grow: 1; width: 100%; height: 100%;" :readOnly="true" :resourceText="extractResult" />
 
     <v-expansion-panels accordion expanded>
@@ -33,8 +38,10 @@
 
 <script lang="ts">
 import { Parameters, Questionnaire } from "fhir/r4b";
+import { Questionnaire as QuestionnaireR4 } from "fhir/r4";
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { settings } from "~/helpers/user_settings";
+import { createInputParameters, extractResultIsOperationOutcome, inAppExtract } from "@aehrc/sdc-template-extract";
 
 @Component
 export default class QuestionnaireExtractTest extends Vue {
@@ -48,6 +55,12 @@ export default class QuestionnaireExtractTest extends Vue {
   public selectedTabValue: number = 2;
   public tabSpaces: number = settings.getTabSpaces();
   public extractParameters: Parameters = { resourceType: "Parameters", parameter: [] };
+  public executionEngines: string[] = [
+    "forms-lab",
+    "CSIRO template-based extract",
+    "Other $extract"
+  ];
+  public selectedEngine: string = "forms-lab";
   public extractServiceUrl: string = "https://fhir.forms-lab.com/QuestionnaireResponse/$extract";
   public extractingInProgress: boolean = false;
 
@@ -72,6 +85,71 @@ export default class QuestionnaireExtractTest extends Vue {
     // Now pass this to the extract service
     this.extractingInProgress = true;
 
+    if (this.selectedEngine === 'forms-lab') {
+      await this.runFormsLabExtractOperation();
+    } else if (this.selectedEngine === 'CSIRO template-based extract') {
+      await this.runCSIROTemplateBasedInAppExtraction();
+    } else if (this.selectedEngine === 'Other $extract') {
+      await this.runOtherExtractOperation();
+    } else {
+      console.error('Unknown engine selected');
+    }
+    this.extractingInProgress = false;
+  }
+
+  async runFormsLabExtractOperation(): Promise<void> {
+    console.log('Running Forms Lab $extract');
+    await this.evaluateExtractOperation("https://fhir.forms-lab.com/QuestionnaireResponse/$extract");
+  }
+
+  async runCSIROTemplateBasedInAppExtraction(): Promise<void> {
+    console.log('Running CSIRO template-based in-app extract');
+    if (!this.questionnaireResponseJson) {
+      return;
+    }
+
+    try {
+      // inAppExtract() does not require $extract input parameters, it handles them internally - but we can still create it for debuqging purposes
+      this.extractParameters = createInputParameters(JSON.parse(this.questionnaireResponseJson),
+        this.questionnaire as QuestionnaireR4,
+        undefined
+      ) as Parameters;
+
+      const inAppExtractOutput = await inAppExtract(
+        JSON.parse(this.questionnaireResponseJson),
+        this.questionnaire as QuestionnaireR4,
+        null
+      );
+
+      const { extractResult } = inAppExtractOutput;
+
+      // Extract result is an OperationOutcome
+      if (extractResultIsOperationOutcome(extractResult)) {
+        this.extractResult = JSON.stringify(extractResult, null, this.tabSpaces);
+        console.error("Failed to extract the questionnaire", extractResult);
+        return;
+      }
+
+      // At this point, extractResult should be a transaction Bundle
+      this.extractResult = JSON.stringify(extractResult.extractedBundle, null, this.tabSpaces);
+
+      if (extractResult.issues) {
+        this.$emit('outcome', extractResult.issues);
+      }
+    } catch (error) {
+      console.error("Error extracting the questionnaire", error);
+    }
+  }
+
+  async runOtherExtractOperation(): Promise<void> {
+    console.log('Running Other pre-pop: ' + this.extractServiceUrl);
+     await this.evaluateExtractOperation(this.extractServiceUrl);
+  }
+
+  async evaluateExtractOperation(extractServiceUrl: string): Promise<void> {
+    if (!this.questionnaireResponseJson)
+      return;
+
     // Send the extract request
     try {
       this.extractParameters.parameter = [
@@ -90,7 +168,7 @@ export default class QuestionnaireExtractTest extends Vue {
       }
 
       this.$emit('outcome', undefined); // reset the outcome to clear any previous issues
-      const response = await fetch(this.extractServiceUrl, {
+      const response = await fetch(extractServiceUrl, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -125,7 +203,6 @@ export default class QuestionnaireExtractTest extends Vue {
     catch (error) {
       console.error("Error extracting the questionnaire", error);
     }
-    this.extractingInProgress = false;
   }
 
   @Watch('questionnaireResponse', { immediate: true, deep: false })
diff --git a/nuxt.config.js b/nuxt.config.js
index 2f86833..ebdc5c1 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -77,11 +77,13 @@ export default {
       "lforms-loader",
       "openai",
       "marked",
+      "sql-on-fhir-v2",
       /* Below are dependencies of CSIRO renderer */
       "@mui",
       "@emotion",
       "@tanstack",
-      "sql-on-fhir-v2",
+      /* Below are dependencies of CSIRO sdc-template-extract */
+      'uuid',
     ],
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 6d18700..7fca2af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,9 @@
       "version": "1.0.0",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@aehrc/sdc-populate": "^4.0.1",
-        "@aehrc/smart-forms-renderer": "^1.0.0-alpha.55",
+        "@aehrc/sdc-populate": "^4.3.0",
+        "@aehrc/sdc-template-extract": "^1.0.1",
+        "@aehrc/smart-forms-renderer": "^1.0.0-alpha.66",
         "@nuxtjs/applicationinsights": "^1.2.2",
         "@types/ace": "^0.0.52",
         "@types/fhir": "^0.0.41",
@@ -61,9 +62,9 @@
       }
     },
     "node_modules/@aehrc/sdc-populate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@aehrc/sdc-populate/-/sdc-populate-4.1.0.tgz",
-      "integrity": "sha512-jplCFvecbFzPr1TSIFj25JocIk0iSd73srkcFXhokbJX/9Leeoxu/jiRYM224H60M79okkdIUR86sB7sFTMFUA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@aehrc/sdc-populate/-/sdc-populate-4.3.0.tgz",
+      "integrity": "sha512-u80EhlB2IxPizREVKQUH6aYfYjZw0+sbxZNbT4N9eHeeuRpJFCm/owklFOfmlVM629IPrZIwKdTa8WWOCPIz9w==",
       "license": "Apache-2.0",
       "dependencies": {
         "dayjs": "^1.11.10",
@@ -109,26 +110,52 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/@aehrc/sdc-template-extract": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@aehrc/sdc-template-extract/-/sdc-template-extract-1.0.1.tgz",
+      "integrity": "sha512-Fg+T8mQ4l0TF1NZSqohv7lZRCJFVYGialyafkfp7P3CJwVIsRm/xQyjQVjto62H4bA0Gr6jF4SszcWzpsPJjdg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "clean-deep": "^3.4.0",
+        "fhirpath": "^4.3.0",
+        "js-base64": "^3.7.7",
+        "uuid": "^11.1.0"
+      }
+    },
+    "node_modules/@aehrc/sdc-template-extract/node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/@aehrc/smart-forms-renderer": {
-      "version": "1.0.0-alpha.55",
-      "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-1.0.0-alpha.55.tgz",
-      "integrity": "sha512-/OezbhmqoDFqNcct1Rpfu4WvOYEEil0mEPP6q9W7LO9GZIO1DGpx16S20nkP+ecxBYobGLssuDrv8FPmaEbBqg==",
+      "version": "1.0.0-alpha.66",
+      "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-1.0.0-alpha.66.tgz",
+      "integrity": "sha512-EN9lE1ez2spVp9Ybb/+1PmLjnz14rfIi1hUxlHqpocCZ4ncrC7cW9b6HN0fS4BJn+fsE7B349zs68lzqbX5ZyQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aehrc/sdc-populate": "^4.1.0",
+        "@aehrc/sdc-populate": "^4.3.0",
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",
         "@fontsource/inter": "^5.2.5",
         "@fontsource/material-icons": "^5.2.5",
         "@fontsource/roboto": "^5.2.5",
         "@iconify/react": "^5.2.1",
-        "@mui/icons-material": "^7.0.2",
-        "@mui/lab": "^7.0.0-beta.11",
-        "@mui/material": "^7.0.2",
+        "@mui/icons-material": "^7.1.1",
+        "@mui/lab": "^7.0.0-beta.13",
+        "@mui/material": "^7.1.1",
         "@mui/x-date-pickers": "^7.28.3",
         "@tanstack/react-query": "^5.72.1",
         "dayjs": "^1.11.13",
         "deep-diff": "^1.0.2",
+        "fast-equals": "^5.2.2",
         "fhirclient": "^2.5.5",
         "fhirpath": "3.18.0",
         "html-react-parser": "^4.2.10",
@@ -137,7 +164,6 @@
         "lodash.difference": "^4.5.0",
         "lodash.differencewith": "^4.5.0",
         "lodash.intersection": "^4.4.0",
-        "lodash.isequal": "^4.5.0",
         "nanoid": "^5.1.5",
         "react-beautiful-dnd": "^13.1.1",
         "react-dnd": "^16.0.1",
@@ -2634,23 +2660,14 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
-      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
+      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
       "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
-      "license": "MIT"
-    },
     "node_modules/@babel/template": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.1.tgz",
@@ -6354,9 +6371,9 @@
       "license": "MIT"
     },
     "node_modules/@mui/core-downloads-tracker": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.0.2.tgz",
-      "integrity": "sha512-TfeFU9TgN1N06hyb/pV/63FfO34nijZRMqgHk0TJ3gkl4Fbd+wZ73+ZtOd7jag6hMmzO9HSrBc6Vdn591nhkAg==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.1.1.tgz",
+      "integrity": "sha512-yBckQs4aQ8mqukLnPC6ivIRv6guhaXi8snVl00VtyojBbm+l6VbVhyTSZ68Abcx7Ah8B+GZhrB7BOli+e+9LkQ==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -6364,12 +6381,12 @@
       }
     },
     "node_modules/@mui/icons-material": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.0.2.tgz",
-      "integrity": "sha512-Bo57PFLOqXOqPNrXjd8AhzH5s6TCsNUQbvnQ0VKZ8D+lIlteqKnrk/O1luMJUc/BXONK7BfIdTdc7qOnXYbMdw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.1.1.tgz",
+      "integrity": "sha512-X37+Yc8QpEnl0sYmz+WcLFy2dWgNRzbswDzLPXG7QU1XDVlP5TPp1HXjdmCupOWLL/I9m1fyhcyZl8/HPpp/Cg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0"
+        "@babel/runtime": "^7.27.1"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -6379,7 +6396,7 @@
         "url": "https://opencollective.com/mui-org"
       },
       "peerDependencies": {
-        "@mui/material": "^7.0.2",
+        "@mui/material": "^7.1.1",
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
       },
@@ -6390,15 +6407,15 @@
       }
     },
     "node_modules/@mui/lab": {
-      "version": "7.0.0-beta.11",
-      "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.0-beta.11.tgz",
-      "integrity": "sha512-VJDEUgiRsjo8V2xDvBEE9Cfs1cSlwzp9UFmD3KzIg6emFMqz9BfYh+9cFI4iQWaoz3Agm3q6bVKlhlX6xw6sVQ==",
+      "version": "7.0.0-beta.13",
+      "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.0-beta.13.tgz",
+      "integrity": "sha512-wLSeePenug3+/kek4cFMIF3QZVC2fHt2Z3O3HwOFvakgErmT39WltYsNpWNojCnXUqcIExUp9xNW0Wk+tJShgA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0",
-        "@mui/system": "^7.0.2",
-        "@mui/types": "^7.4.1",
-        "@mui/utils": "^7.0.2",
+        "@babel/runtime": "^7.27.1",
+        "@mui/system": "^7.1.1",
+        "@mui/types": "^7.4.3",
+        "@mui/utils": "^7.1.1",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1"
       },
@@ -6412,8 +6429,8 @@
       "peerDependencies": {
         "@emotion/react": "^11.5.0",
         "@emotion/styled": "^11.3.0",
-        "@mui/material": "^7.0.2",
-        "@mui/material-pigment-css": "^7.0.2",
+        "@mui/material": "^7.1.1",
+        "@mui/material-pigment-css": "^7.1.1",
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -6434,16 +6451,16 @@
       }
     },
     "node_modules/@mui/material": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.0.2.tgz",
-      "integrity": "sha512-rjJlJ13+3LdLfobRplkXbjIFEIkn6LgpetgU/Cs3Xd8qINCCQK9qXQIjjQ6P0FXFTPFzEVMj0VgBR1mN+FhOcA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.1.1.tgz",
+      "integrity": "sha512-mTpdmdZCaHCGOH3SrYM41+XKvNL0iQfM9KlYgpSjgadXx/fEKhhvOktxm8++Xw6FFeOHoOiV+lzOI8X1rsv71A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0",
-        "@mui/core-downloads-tracker": "^7.0.2",
-        "@mui/system": "^7.0.2",
-        "@mui/types": "^7.4.1",
-        "@mui/utils": "^7.0.2",
+        "@babel/runtime": "^7.27.1",
+        "@mui/core-downloads-tracker": "^7.1.1",
+        "@mui/system": "^7.1.1",
+        "@mui/types": "^7.4.3",
+        "@mui/utils": "^7.1.1",
         "@popperjs/core": "^2.11.8",
         "@types/react-transition-group": "^4.4.12",
         "clsx": "^2.1.1",
@@ -6462,7 +6479,7 @@
       "peerDependencies": {
         "@emotion/react": "^11.5.0",
         "@emotion/styled": "^11.3.0",
-        "@mui/material-pigment-css": "^7.0.2",
+        "@mui/material-pigment-css": "^7.1.1",
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -6495,13 +6512,13 @@
       "license": "MIT"
     },
     "node_modules/@mui/private-theming": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.0.2.tgz",
-      "integrity": "sha512-6lt8heDC9wN8YaRqEdhqnm0cFCv08AMf4IlttFvOVn7ZdKd81PNpD/rEtPGLLwQAFyyKSxBG4/2XCgpbcdNKiA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.1.1.tgz",
+      "integrity": "sha512-M8NbLUx+armk2ZuaxBkkMk11ultnWmrPlN0Xe3jUEaBChg/mcxa5HWIWS1EE4DF36WRACaAHVAvyekWlDQf0PQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0",
-        "@mui/utils": "^7.0.2",
+        "@babel/runtime": "^7.27.1",
+        "@mui/utils": "^7.1.1",
         "prop-types": "^15.8.1"
       },
       "engines": {
@@ -6522,12 +6539,12 @@
       }
     },
     "node_modules/@mui/styled-engine": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.0.2.tgz",
-      "integrity": "sha512-11Bt4YdHGlh7sB8P75S9mRCUxTlgv7HGbr0UKz6m6Z9KLeiw1Bm9y/t3iqLLVMvSHYB6zL8X8X+LmfTE++gyBw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.1.1.tgz",
+      "integrity": "sha512-R2wpzmSN127j26HrCPYVQ53vvMcT5DaKLoWkrfwUYq3cYytL6TQrCH8JBH3z79B6g4nMZZVoaXrxO757AlShaw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0",
+        "@babel/runtime": "^7.27.1",
         "@emotion/cache": "^11.13.5",
         "@emotion/serialize": "^1.3.3",
         "@emotion/sheet": "^1.4.0",
@@ -6562,16 +6579,16 @@
       "license": "MIT"
     },
     "node_modules/@mui/system": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.0.2.tgz",
-      "integrity": "sha512-yFUraAWYWuKIISPPEVPSQ1NLeqmTT4qiQ+ktmyS8LO/KwHxB+NNVOacEZaIofh5x1NxY8rzphvU5X2heRZ/RDA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.1.1.tgz",
+      "integrity": "sha512-Kj1uhiqnj4Zo7PDjAOghtXJtNABunWvhcRU0O7RQJ7WOxeynoH6wXPcilphV8QTFtkKaip8EiNJRiCD+B3eROA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0",
-        "@mui/private-theming": "^7.0.2",
-        "@mui/styled-engine": "^7.0.2",
-        "@mui/types": "^7.4.1",
-        "@mui/utils": "^7.0.2",
+        "@babel/runtime": "^7.27.1",
+        "@mui/private-theming": "^7.1.1",
+        "@mui/styled-engine": "^7.1.1",
+        "@mui/types": "^7.4.3",
+        "@mui/utils": "^7.1.1",
         "clsx": "^2.1.1",
         "csstype": "^3.1.3",
         "prop-types": "^15.8.1"
@@ -6608,12 +6625,12 @@
       "license": "MIT"
     },
     "node_modules/@mui/types": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.1.tgz",
-      "integrity": "sha512-gUL8IIAI52CRXP/MixT1tJKt3SI6tVv4U/9soFsTtAsHzaJQptZ42ffdHZV3niX1ei0aUgMvOxBBN0KYqdG39g==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.3.tgz",
+      "integrity": "sha512-2UCEiK29vtiZTeLdS2d4GndBKacVyxGvReznGXGr+CzW/YhjIX+OHUdCIczZjzcRAgKBGmE9zCIgoV9FleuyRQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0"
+        "@babel/runtime": "^7.27.1"
       },
       "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -6625,13 +6642,13 @@
       }
     },
     "node_modules/@mui/utils": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.0.2.tgz",
-      "integrity": "sha512-72gcuQjPzhj/MLmPHLCgZjy2VjOH4KniR/4qRtXTTXIEwbkgcN+Y5W/rC90rWtMmZbjt9svZev/z+QHUI4j74w==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.1.1.tgz",
+      "integrity": "sha512-BkOt2q7MBYl7pweY2JWwfrlahhp+uGLR8S+EhiyRaofeRYUWL2YKbSGQvN4hgSN1i8poN0PaUiii1kEMrchvzg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.0",
-        "@mui/types": "^7.4.1",
+        "@babel/runtime": "^7.27.1",
+        "@mui/types": "^7.4.3",
         "@types/prop-types": "^15.7.14",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
@@ -12366,6 +12383,20 @@
         "node": ">= 10.0"
       }
     },
+    "node_modules/clean-deep": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/clean-deep/-/clean-deep-3.4.0.tgz",
+      "integrity": "sha512-Lo78NV5ItJL/jl+B5w0BycAisaieJGXK1qYi/9m4SjR8zbqmrUtO7Yhro40wEShGmmxs/aJLI/A+jNhdkXK8mw==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash.isempty": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.transform": "^4.6.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -15960,6 +15991,15 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "license": "MIT"
     },
+    "node_modules/fast-equals": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.2.2.tgz",
+      "integrity": "sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -20630,10 +20670,16 @@
       "integrity": "sha512-N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg==",
       "license": "MIT"
     },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+    "node_modules/lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
       "license": "MIT"
     },
     "node_modules/lodash.kebabcase": {
@@ -20683,6 +20729,12 @@
       "optional": true,
       "peer": true
     },
+    "node_modules/lodash.transform": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
+      "integrity": "sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ==",
+      "license": "MIT"
+    },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
diff --git a/package.json b/package.json
index 00aaee8..87cfced 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,9 @@
     "dockerize": "docker build -t fhirpath-lab ."
   },
   "dependencies": {
-    "@aehrc/sdc-populate": "^4.0.1",
-    "@aehrc/smart-forms-renderer": "^1.0.0-alpha.55",
+    "@aehrc/sdc-populate": "^4.3.0",
+    "@aehrc/sdc-template-extract": "^1.0.1",
+    "@aehrc/smart-forms-renderer": "^1.0.0-alpha.66",
     "@nuxtjs/applicationinsights": "^1.2.2",
     "@types/ace": "^0.0.52",
     "@types/fhir": "^0.0.41",